Merge remote-tracking branch 'origin/developerB' into developerB

src/main/java/com/caimei/modules/weisha/web/CmOrganizeClubController.java

@@ -141,7 +141,6 @@ public class CmOrganizeClubController extends BaseController {
                 cmUser.setAccount(newCmClub.getContractMobile() + RandomCodeGenerator.generateAccount(2));
                 cmUser.setPassword("weisha");
                 cmUser.setBindMobile(newCmClub.getContractMobile());
-                cmUser.setUserName(newCmClub.getName());
                 cmUser.setUserMoney(0d);
                 cmUser.setAbleUserMoney(0d);
                 cmUser.setValidFlag("1");
@@ -151,7 +150,6 @@ public class CmOrganizeClubController extends BaseController {
                 cmUserService.insert(cmUser);//插入新的用户数据
             }
             //添加会所表信息
-            newCmClub.setSname(newCmClub.getName());
             if (null == clubID) {
                 newCmClub.setStatus(90);
                 newCmClub.setUserID(cmUser.getUserID());