机构数据整理

src/main/java/com/caimei/modules/user/entity/NewCmClub.java

@@ -20,7 +20,6 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private Integer clubID;        // 会所ID
     private Integer userID;        // 用户ID
     private Integer userOrganizeID;//用户组织ID
-    private Integer clubTypeID;        // 【已废弃】会所类型
     private String userPermission;
     private String name;        // 会所名称
     private String sname;        // 简称
@@ -33,70 +32,32 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private String searchUserIdentity;//搜索用户类型
     private String searchStartTime;     //搜索注册时间开始 查询条件
     private String searchEndTime;        //搜索注册时间结束  查询条件
-    private String nameEn;        // 会所英文名称
-    private String site;        // 网址
     private String logo;        // logo
-    private Double level;        // 【已废弃】未知
-    private Double score;        // 【已废弃】未知
-    private Integer subClubCount;        // 【已废弃】子会所数量
     private String legalPerson;        // 法人
     private Integer provinceID;        // 省
     private Integer cityID;        // 市
     private Integer townID;        // 地址ID
-    private String agreement;        // 是否同意协议
     private String flag;        // 拉会所上线的用户的cmBindId,以逗号结尾
     private Integer inviterBindID;        // 邀请者cmBindId
     private String inviterName;        // 邀请者名称
     private Integer spID;        // 协销Id
     private Integer mainServiceProviderID;        // 协销经理Id
     private String scanTime;        // 扫描时间
-    private Date checkTime;        // 上线时间
     private String address;        // 详细地址
-    private Double registeredCapital;        // 注册资金
-    private Integer mainClubID;        // 集团会所ID
-    private Double turnover;        // 营业额
     private String linkMan;        // 联系人
     private Integer linkManIdentity;    //联系人身份：1老板，2采购，3运营
     private String contractPhone;        // 联系电话
     private String contractMobile;        // 联系手机
     private String fax;        // 传真
-    private String zipCode;        // 邮编
-    private String linkMan1;        // 联系人
-    private String duty1;        // 职务
-    private String contractPhone1;        // 联系电话1
-    private String contractMobile1;        // 手机号1
-    private String contractQQ1;        // 联系QQ
-    private String wechat1;        // 微信号
-    private String contractEmail1;        // 联系邮箱
-    private String linkMan2;        // 联系人
-    private String duty2;        // 职务
-    private String contractPhone2;        // 联系电话
-    private String contractMobile2;        // 联系手机
-    private String contractQQ2;        // 联系QQ
-    private String wechat2;        // 微信号
-    private String contractEmail2;        // 联系邮箱
-    private String scope;        // 经营范围
     private String info;        // 公司简介
-    private Double lng;        // 纬度
-    private Double lat;        // 经度
     private String addTime;        // 注册时间
-    private Integer favoriteTimes;        // 收藏量
-    private String payFlag1;        // 支付
     private String auditTime;        // 审核时间
     private String auditNote;        // 审核备注
     private Integer status;        // 状态
-    private String clubInvitationStatus;        // 集团会所邀请状态
-    private String recAddress;        // 收货地址
     private String businessLicenseImage;        // 营业执照
-    private Integer sortIndex;        // 排序值
-    private Integer recTownID;        // 收货地址县级ID
     private Integer defaultServiceProviderID;        // 默认的创客
     private String defaultServiceProviderUpdTime;        // 创客更新时间
-    private String firstServiceProviderFlag;        // 第一次服务标志
-    private String scale;        // 规模
-    private Integer empnum;        // 员工数
     private String mainpro;        // 主打项目
-    private String remark;        // 备注
     private String scanFlag;        // 扫描状态 0待扫描 1 已扫描 2已上线
     private String headpic;        // 门头照
     private Date lastModify;        // 最后更新时间
@@ -116,10 +77,8 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private String userName;  //联系人
     private String bindMobile;  //企业绑定手机号
     private String email;       //邮箱
-    private Integer userLevelID;
     private Date registerTime;
     private String registerIP;// IP
-    private String smsFlag;        // 短信是否发送成功
     private String userScanFlag;        // 扫描标志(4 CRM拉上来的会所)
     private String town; // 区
     private String city; // 市
@@ -178,14 +137,14 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.userID = userID;
     }
 
-    @NotNull(message = "【已废弃】会所类型不能为空")
-    public Integer getClubTypeID() {
-        return clubTypeID;
-    }
-
-    public void setClubTypeID(Integer clubTypeID) {
-        this.clubTypeID = clubTypeID;
-    }
+//    @NotNull(message = "【已废弃】会所类型不能为空")
+//    public Integer getClubTypeID() {
+//        return clubTypeID;
+//    }
+//
+//    public void setClubTypeID(Integer clubTypeID) {
+//        this.clubTypeID = clubTypeID;
+//    }
 
     @Length(min = 0, max = 50, message = "会所名称长度必须介于 0 和 50 之间")
     public String getName() {
@@ -205,23 +164,23 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.sname = sname;
     }
 
-    @Length(min = 0, max = 100, message = "会所英文名称长度必须介于 0 和 100 之间")
-    public String getNameEn() {
-        return nameEn;
-    }
-
-    public void setNameEn(String nameEn) {
-        this.nameEn = nameEn;
-    }
-
-    @Length(min = 0, max = 200, message = "网址长度必须介于 0 和 200 之间")
-    public String getSite() {
-        return site;
-    }
-
-    public void setSite(String site) {
-        this.site = site;
-    }
+//    @Length(min = 0, max = 100, message = "会所英文名称长度必须介于 0 和 100 之间")
+//    public String getNameEn() {
+//        return nameEn;
+//    }
+//
+//    public void setNameEn(String nameEn) {
+//        this.nameEn = nameEn;
+//    }
+//
+//    @Length(min = 0, max = 200, message = "网址长度必须介于 0 和 200 之间")
+//    public String getSite() {
+//        return site;
+//    }
+//
+//    public void setSite(String site) {
+//        this.site = site;
+//    }
 
     @Length(min = 0, max = 200, message = "logo长度必须介于 0 和 200 之间")
     public String getLogo() {
@@ -232,29 +191,29 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.logo = logo;
     }
 
-    public Double getLevel() {
-        return level;
-    }
-
-    public void setLevel(Double level) {
-        this.level = level;
-    }
-
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public Integer getSubClubCount() {
-        return subClubCount;
-    }
-
-    public void setSubClubCount(Integer subClubCount) {
-        this.subClubCount = subClubCount;
-    }
+//    public Double getLevel() {
+//        return level;
+//    }
+//
+//    public void setLevel(Double level) {
+//        this.level = level;
+//    }
+//
+//    public Double getScore() {
+//        return score;
+//    }
+//
+//    public void setScore(Double score) {
+//        this.score = score;
+//    }
+//
+//    public Integer getSubClubCount() {
+//        return subClubCount;
+//    }
+//
+//    public void setSubClubCount(Integer subClubCount) {
+//        this.subClubCount = subClubCount;
+//    }
 
     @Length(min = 0, max = 20, message = "法人长度必须介于 0 和 20 之间")
     public String getLegalPerson() {
@@ -289,14 +248,14 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.townID = townID;
     }
 
-    @Length(min = 0, max = 1, message = "是否同意协议长度必须介于 0 和 1 之间")
-    public String getAgreement() {
-        return agreement;
-    }
-
-    public void setAgreement(String agreement) {
-        this.agreement = agreement;
-    }
+//    @Length(min = 0, max = 1, message = "是否同意协议长度必须介于 0 和 1 之间")
+//    public String getAgreement() {
+//        return agreement;
+//    }
+//
+//    public void setAgreement(String agreement) {
+//        this.agreement = agreement;
+//    }
 
     @Length(min = 0, max = 100, message = "拉会所上线的用户的cmBindId,以逗号结尾长度必须介于 0 和 100 之间")
     public String getFlag() {
@@ -348,14 +307,14 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.scanTime = scanTime;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getCheckTime() {
-        return checkTime;
-    }
-
-    public void setCheckTime(Date checkTime) {
-        this.checkTime = checkTime;
-    }
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    public Date getCheckTime() {
+//        return checkTime;
+//    }
+//
+//    public void setCheckTime(Date checkTime) {
+//        this.checkTime = checkTime;
+//    }
 
     @Length(min = 0, max = 100, message = "详细地址长度必须介于 0 和 100 之间")
     public String getAddress() {
@@ -366,29 +325,29 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.address = address;
     }
 
-    public Double getRegisteredCapital() {
-        return registeredCapital;
-    }
-
-    public void setRegisteredCapital(Double registeredCapital) {
-        this.registeredCapital = registeredCapital;
-    }
-
-    public Integer getMainClubID() {
-        return mainClubID;
-    }
-
-    public void setMainClubID(Integer mainClubID) {
-        this.mainClubID = mainClubID;
-    }
-
-    public Double getTurnover() {
-        return turnover;
-    }
-
-    public void setTurnover(Double turnover) {
-        this.turnover = turnover;
-    }
+//    public Double getRegisteredCapital() {
+//        return registeredCapital;
+//    }
+//
+//    public void setRegisteredCapital(Double registeredCapital) {
+//        this.registeredCapital = registeredCapital;
+//    }
+//
+//    public Integer getMainClubID() {
+//        return mainClubID;
+//    }
+//
+//    public void setMainClubID(Integer mainClubID) {
+//        this.mainClubID = mainClubID;
+//    }
+//
+//    public Double getTurnover() {
+//        return turnover;
+//    }
+//
+//    public void setTurnover(Double turnover) {
+//        this.turnover = turnover;
+//    }
 
     @Length(min = 0, max = 50, message = "联系人长度必须介于 0 和 50 之间")
     public String getLinkMan() {
@@ -426,149 +385,149 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.fax = fax;
     }
 
-    @Length(min = 0, max = 10, message = "邮编长度必须介于 0 和 10 之间")
-    public String getZipCode() {
-        return zipCode;
-    }
-
-    public void setZipCode(String zipCode) {
-        this.zipCode = zipCode;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人长度必须介于 0 和 50 之间")
-    public String getLinkMan1() {
-        return linkMan1;
-    }
-
-    public void setLinkMan1(String linkMan1) {
-        this.linkMan1 = linkMan1;
-    }
-
-    @Length(min = 0, max = 50, message = "职务长度必须介于 0 和 50 之间")
-    public String getDuty1() {
-        return duty1;
-    }
-
-    public void setDuty1(String duty1) {
-        this.duty1 = duty1;
-    }
-
-    @Length(min = 0, max = 50, message = "联系电话1长度必须介于 0 和 50 之间")
-    public String getContractPhone1() {
-        return contractPhone1;
-    }
-
-    public void setContractPhone1(String contractPhone1) {
-        this.contractPhone1 = contractPhone1;
-    }
-
-    @Length(min = 0, max = 20, message = "手机号1长度必须介于 0 和 20 之间")
-    public String getContractMobile1() {
-        return contractMobile1;
-    }
-
-    public void setContractMobile1(String contractMobile1) {
-        this.contractMobile1 = contractMobile1;
-    }
-
-    @Length(min = 0, max = 20, message = "联系QQ长度必须介于 0 和 20 之间")
-    public String getContractQQ1() {
-        return contractQQ1;
-    }
-
-    public void setContractQQ1(String contractQQ1) {
-        this.contractQQ1 = contractQQ1;
-    }
-
-    @Length(min = 0, max = 50, message = "微信号长度必须介于 0 和 50 之间")
-    public String getWechat1() {
-        return wechat1;
-    }
-
-    public void setWechat1(String wechat1) {
-        this.wechat1 = wechat1;
-    }
-
-    @Length(min = 0, max = 50, message = "联系邮箱长度必须介于 0 和 50 之间")
-    public String getContractEmail1() {
-        return contractEmail1;
-    }
-
-    public void setContractEmail1(String contractEmail1) {
-        this.contractEmail1 = contractEmail1;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人长度必须介于 0 和 50 之间")
-    public String getLinkMan2() {
-        return linkMan2;
-    }
-
-    public void setLinkMan2(String linkMan2) {
-        this.linkMan2 = linkMan2;
-    }
-
-    @Length(min = 0, max = 50, message = "职务长度必须介于 0 和 50 之间")
-    public String getDuty2() {
-        return duty2;
-    }
-
-    public void setDuty2(String duty2) {
-        this.duty2 = duty2;
-    }
-
-    @Length(min = 0, max = 50, message = "联系电话长度必须介于 0 和 50 之间")
-    public String getContractPhone2() {
-        return contractPhone2;
-    }
-
-    public void setContractPhone2(String contractPhone2) {
-        this.contractPhone2 = contractPhone2;
-    }
-
-    @Length(min = 0, max = 20, message = "联系手机长度必须介于 0 和 20 之间")
-    public String getContractMobile2() {
-        return contractMobile2;
-    }
-
-    public void setContractMobile2(String contractMobile2) {
-        this.contractMobile2 = contractMobile2;
-    }
-
-    @Length(min = 0, max = 20, message = "联系QQ长度必须介于 0 和 20 之间")
-    public String getContractQQ2() {
-        return contractQQ2;
-    }
-
-    public void setContractQQ2(String contractQQ2) {
-        this.contractQQ2 = contractQQ2;
-    }
-
-    @Length(min = 0, max = 50, message = "微信号长度必须介于 0 和 50 之间")
-    public String getWechat2() {
-        return wechat2;
-    }
-
-    public void setWechat2(String wechat2) {
-        this.wechat2 = wechat2;
-    }
-
-    @Length(min = 0, max = 50, message = "联系邮箱长度必须介于 0 和 50 之间")
-    public String getContractEmail2() {
-        return contractEmail2;
-    }
-
-    public void setContractEmail2(String contractEmail2) {
-        this.contractEmail2 = contractEmail2;
-    }
-
-    @Length(min = 0, max = 100, message = "经营范围长度必须介于 0 和 100 之间")
-    public String getScope() {
-        return scope;
-    }
-
-    public void setScope(String scope) {
-        this.scope = scope;
-    }
+//    @Length(min = 0, max = 10, message = "邮编长度必须介于 0 和 10 之间")
+//    public String getZipCode() {
+//        return zipCode;
+//    }
+//
+//    public void setZipCode(String zipCode) {
+//        this.zipCode = zipCode;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人长度必须介于 0 和 50 之间")
+//    public String getLinkMan1() {
+//        return linkMan1;
+//    }
+//
+//    public void setLinkMan1(String linkMan1) {
+//        this.linkMan1 = linkMan1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "职务长度必须介于 0 和 50 之间")
+//    public String getDuty1() {
+//        return duty1;
+//    }
+//
+//    public void setDuty1(String duty1) {
+//        this.duty1 = duty1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系电话1长度必须介于 0 和 50 之间")
+//    public String getContractPhone1() {
+//        return contractPhone1;
+//    }
+//
+//    public void setContractPhone1(String contractPhone1) {
+//        this.contractPhone1 = contractPhone1;
+//    }
+//
+//    @Length(min = 0, max = 20, message = "手机号1长度必须介于 0 和 20 之间")
+//    public String getContractMobile1() {
+//        return contractMobile1;
+//    }
+//
+//    public void setContractMobile1(String contractMobile1) {
+//        this.contractMobile1 = contractMobile1;
+//    }
+//
+//    @Length(min = 0, max = 20, message = "联系QQ长度必须介于 0 和 20 之间")
+//    public String getContractQQ1() {
+//        return contractQQ1;
+//    }
+//
+//    public void setContractQQ1(String contractQQ1) {
+//        this.contractQQ1 = contractQQ1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "微信号长度必须介于 0 和 50 之间")
+//    public String getWechat1() {
+//        return wechat1;
+//    }
+//
+//    public void setWechat1(String wechat1) {
+//        this.wechat1 = wechat1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系邮箱长度必须介于 0 和 50 之间")
+//    public String getContractEmail1() {
+//        return contractEmail1;
+//    }
+//
+//    public void setContractEmail1(String contractEmail1) {
+//        this.contractEmail1 = contractEmail1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人长度必须介于 0 和 50 之间")
+//    public String getLinkMan2() {
+//        return linkMan2;
+//    }
+//
+//    public void setLinkMan2(String linkMan2) {
+//        this.linkMan2 = linkMan2;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "职务长度必须介于 0 和 50 之间")
+//    public String getDuty2() {
+//        return duty2;
+//    }
+//
+//    public void setDuty2(String duty2) {
+//        this.duty2 = duty2;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系电话长度必须介于 0 和 50 之间")
+//    public String getContractPhone2() {
+//        return contractPhone2;
+//    }
+//
+//    public void setContractPhone2(String contractPhone2) {
+//        this.contractPhone2 = contractPhone2;
+//    }
+//
+//    @Length(min = 0, max = 20, message = "联系手机长度必须介于 0 和 20 之间")
+//    public String getContractMobile2() {
+//        return contractMobile2;
+//    }
+//
+//    public void setContractMobile2(String contractMobile2) {
+//        this.contractMobile2 = contractMobile2;
+//    }
+//
+//    @Length(min = 0, max = 20, message = "联系QQ长度必须介于 0 和 20 之间")
+//    public String getContractQQ2() {
+//        return contractQQ2;
+//    }
+//
+//    public void setContractQQ2(String contractQQ2) {
+//        this.contractQQ2 = contractQQ2;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "微信号长度必须介于 0 和 50 之间")
+//    public String getWechat2() {
+//        return wechat2;
+//    }
+//
+//    public void setWechat2(String wechat2) {
+//        this.wechat2 = wechat2;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系邮箱长度必须介于 0 和 50 之间")
+//    public String getContractEmail2() {
+//        return contractEmail2;
+//    }
+//
+//    public void setContractEmail2(String contractEmail2) {
+//        this.contractEmail2 = contractEmail2;
+//    }
+//
+//    @Length(min = 0, max = 100, message = "经营范围长度必须介于 0 和 100 之间")
+//    public String getScope() {
+//        return scope;
+//    }
+//
+//    public void setScope(String scope) {
+//        this.scope = scope;
+//    }
 
     @Length(min = 0, max = 500, message = "公司简介长度必须介于 0 和 500 之间")
     public String getInfo() {
@@ -579,21 +538,21 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.info = info;
     }
 
-    public Double getLng() {
-        return lng;
-    }
-
-    public void setLng(Double lng) {
-        this.lng = lng;
-    }
-
-    public Double getLat() {
-        return lat;
-    }
-
-    public void setLat(Double lat) {
-        this.lat = lat;
-    }
+//    public Double getLng() {
+//        return lng;
+//    }
+//
+//    public void setLng(Double lng) {
+//        this.lng = lng;
+//    }
+//
+//    public Double getLat() {
+//        return lat;
+//    }
+//
+//    public void setLat(Double lat) {
+//        this.lat = lat;
+//    }
 
     public String getAddTime() {
         return addTime;
@@ -603,22 +562,22 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.addTime = addTime;
     }
 
-    public Integer getFavoriteTimes() {
-        return favoriteTimes;
-    }
-
-    public void setFavoriteTimes(Integer favoriteTimes) {
-        this.favoriteTimes = favoriteTimes;
-    }
-
-    @Length(min = 0, max = 1, message = "支付长度必须介于 0 和 1 之间")
-    public String getPayFlag1() {
-        return payFlag1;
-    }
-
-    public void setPayFlag1(String payFlag1) {
-        this.payFlag1 = payFlag1;
-    }
+//    public Integer getFavoriteTimes() {
+//        return favoriteTimes;
+//    }
+//
+//    public void setFavoriteTimes(Integer favoriteTimes) {
+//        this.favoriteTimes = favoriteTimes;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "支付长度必须介于 0 和 1 之间")
+//    public String getPayFlag1() {
+//        return payFlag1;
+//    }
+//
+//    public void setPayFlag1(String payFlag1) {
+//        this.payFlag1 = payFlag1;
+//    }
 
     @Length(min = 0, max = 19, message = "审核时间长度必须介于 0 和 19 之间")
     public String getAuditTime() {
@@ -646,23 +605,23 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.status = status;
     }
 
-    @Length(min = 0, max = 1, message = "集团会所邀请状态长度必须介于 0 和 1 之间")
-    public String getClubInvitationStatus() {
-        return clubInvitationStatus;
-    }
-
-    public void setClubInvitationStatus(String clubInvitationStatus) {
-        this.clubInvitationStatus = clubInvitationStatus;
-    }
-
-    @Length(min = 0, max = 100, message = "收货地址长度必须介于 0 和 100 之间")
-    public String getRecAddress() {
-        return recAddress;
-    }
-
-    public void setRecAddress(String recAddress) {
-        this.recAddress = recAddress;
-    }
+//    @Length(min = 0, max = 1, message = "集团会所邀请状态长度必须介于 0 和 1 之间")
+//    public String getClubInvitationStatus() {
+//        return clubInvitationStatus;
+//    }
+//
+//    public void setClubInvitationStatus(String clubInvitationStatus) {
+//        this.clubInvitationStatus = clubInvitationStatus;
+//    }
+//
+//    @Length(min = 0, max = 100, message = "收货地址长度必须介于 0 和 100 之间")
+//    public String getRecAddress() {
+//        return recAddress;
+//    }
+//
+//    public void setRecAddress(String recAddress) {
+//        this.recAddress = recAddress;
+//    }
 
     @Length(min = 0, max = 200, message = "营业执照长度必须介于 0 和 200 之间")
     public String getBusinessLicenseImage() {
@@ -673,21 +632,21 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.businessLicenseImage = businessLicenseImage;
     }
 
-    public Integer getSortIndex() {
-        return sortIndex;
-    }
-
-    public void setSortIndex(Integer sortIndex) {
-        this.sortIndex = sortIndex;
-    }
-
-    public Integer getRecTownID() {
-        return recTownID;
-    }
-
-    public void setRecTownID(Integer recTownID) {
-        this.recTownID = recTownID;
-    }
+//    public Integer getSortIndex() {
+//        return sortIndex;
+//    }
+//
+//    public void setSortIndex(Integer sortIndex) {
+//        this.sortIndex = sortIndex;
+//    }
+//
+//    public Integer getRecTownID() {
+//        return recTownID;
+//    }
+//
+//    public void setRecTownID(Integer recTownID) {
+//        this.recTownID = recTownID;
+//    }
 
     public Integer getDefaultServiceProviderID() {
         return defaultServiceProviderID;
@@ -706,31 +665,31 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.defaultServiceProviderUpdTime = defaultServiceProviderUpdTime;
     }
 
-    @Length(min = 0, max = 1, message = "第一次服务标志长度必须介于 0 和 1 之间")
-    public String getFirstServiceProviderFlag() {
-        return firstServiceProviderFlag;
-    }
-
-    public void setFirstServiceProviderFlag(String firstServiceProviderFlag) {
-        this.firstServiceProviderFlag = firstServiceProviderFlag;
-    }
-
-    @Length(min = 0, max = 20, message = "规模长度必须介于 0 和 20 之间")
-    public String getScale() {
-        return scale;
-    }
-
-    public void setScale(String scale) {
-        this.scale = scale;
-    }
-
-    public Integer getEmpnum() {
-        return empnum;
-    }
-
-    public void setEmpnum(Integer empnum) {
-        this.empnum = empnum;
-    }
+//    @Length(min = 0, max = 1, message = "第一次服务标志长度必须介于 0 和 1 之间")
+//    public String getFirstServiceProviderFlag() {
+//        return firstServiceProviderFlag;
+//    }
+//
+//    public void setFirstServiceProviderFlag(String firstServiceProviderFlag) {
+//        this.firstServiceProviderFlag = firstServiceProviderFlag;
+//    }
+
+//    @Length(min = 0, max = 20, message = "规模长度必须介于 0 和 20 之间")
+//    public String getScale() {
+//        return scale;
+//    }
+//
+//    public void setScale(String scale) {
+//        this.scale = scale;
+//    }
+//
+//    public Integer getEmpnum() {
+//        return empnum;
+//    }
+//
+//    public void setEmpnum(Integer empnum) {
+//        this.empnum = empnum;
+//    }
 
     @Length(min = 0, max = 200, message = "主打项目长度必须介于 0 和 200 之间")
     public String getMainpro() {
@@ -741,14 +700,14 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.mainpro = mainpro;
     }
 
-    @Length(min = 0, max = 500, message = "备注长度必须介于 0 和 500 之间")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
+//    @Length(min = 0, max = 500, message = "备注长度必须介于 0 和 500 之间")
+//    public String getRemark() {
+//        return remark;
+//    }
+//
+//    public void setRemark(String remark) {
+//        this.remark = remark;
+//    }
 
     @Length(min = 1, max = 2, message = "扫描状态 0待扫描 1 已扫描 2已上线长度必须介于 1 和 2 之间")
     public String getScanFlag() {
@@ -809,13 +768,13 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.userName = userName;
     }
 
-    public Integer getUserLevelID() {
-        return userLevelID;
-    }
-
-    public void setUserLevelID(Integer userLevelID) {
-        this.userLevelID = userLevelID;
-    }
+//    public Integer getUserLevelID() {
+//        return userLevelID;
+//    }
+//
+//    public void setUserLevelID(Integer userLevelID) {
+//        this.userLevelID = userLevelID;
+//    }
 
     public Date getRegisterTime() {
         return registerTime;
@@ -825,13 +784,13 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.registerTime = registerTime;
     }
 
-    public String getSmsFlag() {
-        return smsFlag;
-    }
-
-    public void setSmsFlag(String smsFlag) {
-        this.smsFlag = smsFlag;
-    }
+//    public String getSmsFlag() {
+//        return smsFlag;
+//    }
+//
+//    public void setSmsFlag(String smsFlag) {
+//        this.smsFlag = smsFlag;
+//    }
 
     public String getUserScanFlag() {
         return userScanFlag;

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -4,86 +4,47 @@
 
 	<sql id="newCmClubColumns">
 		a.clubID AS "clubID",
-		a.userID AS "userID",
-		a.clubTypeID AS "clubTypeID",
-		u.name AS "name",
-		a.sname AS "sname",
-		a.nameEn AS "nameEn",
-		a.site AS "site",
-		a.logo AS "logo",
-		a.level AS "level",
-		a.score AS "score",
-		a.subClubCount AS "subClubCount",
-		a.legalPerson AS "legalPerson",
-		a.provinceID AS "provinceID",
-		a.cityID AS "cityID",
-		a.townID AS "townID",
-		a.agreement AS "agreement",
-		a.flag AS "flag",
-		a.inviterBindID AS "inviterBindID",
-		a.inviterName AS "inviterName",
-		a.spID AS "spID",
-		a.mainServiceProviderID AS "mainServiceProviderID",
-		a.scanTime AS "scanTime",
-		a.checkTime AS "checkTime",
-		a.address AS "address",
-		a.registeredCapital AS "registeredCapital",
-		a.mainClubID AS "mainClubID",
-		a.turnover AS "turnover",
-		a.linkMan AS "linkMan",
-		a.linkManIdentity AS "linkManIdentity",
-		a.contractPhone AS "contractPhone",
-		a.contractMobile AS "contractMobile",
-		a.fax AS "fax",
-		a.zipCode AS "zipCode",
-		a.linkMan1 AS "linkMan1",
-		a.duty1 AS "duty1",
-		a.contractPhone1 AS "contractPhone1",
-		a.contractMobile1 AS "contractMobile1",
-		a.contractQQ1 AS "contractQQ1",
-		a.wechat1 AS "wechat1",
-		a.contractEmail1 AS "contractEmail1",
-		a.linkMan2 AS "linkMan2",
-		a.duty2 AS "duty2",
-		a.contractPhone2 AS "contractPhone2",
-		a.contractMobile2 AS "contractMobile2",
-		a.contractQQ2 AS "contractQQ2",
-		a.wechat2 AS "wechat2",
-		a.contractEmail2 AS "contractEmail2",
-		a.scope AS "scope",
-		a.info AS "info",
-		a.lng AS "lng",
-		a.lat AS "lat",
-		a.addTime AS "addTime",
-		a.favoriteTimes AS "favoriteTimes",
-		a.payFlag1 AS "payFlag1",
-		a.auditTime AS "auditTime",
-		a.auditNote AS "auditNote",
-		a.status AS "status",
-		a.clubInvitationStatus AS "clubInvitationStatus",
-		a.recAddress AS "recAddress",
-		a.businessLicenseImage AS "businessLicenseImage",
-		a.sortIndex AS "sortIndex",
-		a.recTownID AS "recTownID",
-		a.defaultServiceProviderID AS "defaultServiceProviderID",
-		a.defaultServiceProviderUpdTime AS "defaultServiceProviderUpdTime",
-		a.firstServiceProviderFlag AS "firstServiceProviderFlag",
-		a.scale AS "scale",
-		a.empnum AS "empnum",
-		a.mainpro AS "mainpro",
-		a.remark AS "remark",
-		a.scanFlag AS "scanFlag",
-		a.headpic AS "headpic",
-		a.socialCreditCode AS "socialCreditCode",
-		a.lastModify AS "lastModify",
-		a.firstClubType AS "firstClubType",
-        a.secondClubType AS "secondClubType",
-        a.department AS "department",
-        a.medicalPracticeLicenseImg AS "medicalPracticeLicenseImg"
+			a.userID AS "userID",
+			u.name AS "name",
+			a.sname AS "sname",
+			a.logo AS "logo",
+			a.legalPerson AS "legalPerson",
+			a.provinceID AS "provinceID",
+			a.cityID AS "cityID",
+			a.townID AS "townID",
+			a.flag AS "flag",
+			a.inviterBindID AS "inviterBindID",
+			a.inviterName AS "inviterName",
+			a.spID AS "spID",
+			a.mainServiceProviderID AS "mainServiceProviderID",
+			a.scanTime AS "scanTime",
+			a.address AS "address",
+			a.linkMan AS "linkMan",
+			a.linkManIdentity AS "linkManIdentity",
+			a.contractPhone AS "contractPhone",
+			a.contractMobile AS "contractMobile",
+			a.fax AS "fax",
+			a.info AS "info",
+			a.addTime AS "addTime",
+			a.auditTime AS "auditTime",
+			a.auditNote AS "auditNote",
+			a.status AS "status",
+			a.businessLicenseImage AS "businessLicenseImage",
+			a.defaultServiceProviderID AS "defaultServiceProviderID",
+			a.defaultServiceProviderUpdTime AS "defaultServiceProviderUpdTime",
+			a.mainpro AS "mainpro",
+			a.scanFlag AS "scanFlag",
+			a.headpic AS "headpic",
+			a.socialCreditCode AS "socialCreditCode",
+			a.lastModify AS "lastModify",
+			a.firstClubType AS "firstClubType",
+			a.secondClubType AS "secondClubType",
+			a.department AS "department",
+			a.medicalPracticeLicenseImg AS "medicalPracticeLicenseImg"
 	</sql>
 
 	<sql id="otherColumns">
-		,case sp.status when 91 then '采美默认协销经理(官方账号)' else sp.linkMan1 end AS "spName",
+		,case sp.status when 91 then '采美默认协销经理(官方账号)' else sp.linkMan end AS "spName",
 		d.name AS "province",
 		c.name AS "city",
 		b.name AS  "town",
@@ -91,8 +52,6 @@
 		u.registerTime AS "registerTime",
 		u.registerIP AS "registerIP",
 		u.userName AS "userName",
-		u.userLevelID AS  "userLevelID",
-		u.smsFlag AS "smsFlag",
 		u.bindMobile AS "bindMobile",
 		u.email AS "email",
 		u.userOrganizeID AS "userOrganizeID",
@@ -150,9 +109,6 @@
 			<if test="userName != null and userName != ''">
 				AND u.userName LIKE concat('%',#{userName},'%')
 			</if>
-			<if test="userLevelID != null and userLevelID != ''">
-				AND u.userLevelID = #{userLevelID}
-			</if>
 			<if test="townID != null and townID != ''">
 				AND d.provinceID = #{provinceID}
 			</if>
@@ -222,70 +178,32 @@
 			userID,
 			name,
 			sname,
-			nameEn,
-			site,
 			logo,
-			level,
-			score,
-			subClubCount,
 			legalPerson,
 			provinceID,
 			cityID,
 			townID,
-			agreement,
 			flag,
 			inviterBindID,
 			inviterName,
 			spID,
 			mainServiceProviderID,
 			scanTime,
-			checkTime,
 			address,
-			registeredCapital,
-			mainClubID,
-			turnover,
 			linkMan,
 			linkManIdentity,
 			contractPhone,
 			contractMobile,
 			fax,
-			zipCode,
-			linkMan1,
-			duty1,
-			contractPhone1,
-			contractMobile1,
-			contractQQ1,
-			wechat1,
-			contractEmail1,
-			linkMan2,
-			duty2,
-			contractPhone2,
-			contractMobile2,
-			contractQQ2,
-			wechat2,
-			contractEmail2,
-			scope,
 			info,
-			lng,
-			lat,
 			addTime,
-			favoriteTimes,
-			payFlag1,
 			auditTime,
 			auditNote,
 			status,
-			clubInvitationStatus,
-			recAddress,
 			businessLicenseImage,
-			sortIndex,
-			recTownID,
 			defaultServiceProviderID,
 			defaultServiceProviderUpdTime,
-			firstServiceProviderFlag,
-			scale,
-			empnum,
 			mainpro,
-			remark,
 			scanFlag,
 			headpic,
 			lastModify,
@@ -298,68 +216,31 @@
 			#{userID},
 			#{name},
 			#{sname},
-			#{nameEn},
-			#{site},
 			#{logo},
-			#{level},
-			#{score},
-			#{subClubCount},
 			#{legalPerson},
 			#{provinceID},
 			#{cityID},
 			#{townID},
-			#{agreement},
 			#{flag},
 			#{inviterBindID},
 			#{inviterName},
 			#{spID},
 			#{mainServiceProviderID},
 			#{scanTime},
-			#{checkTime},
 			#{address},
-			#{registeredCapital},
-			#{mainClubID},
-			#{turnover},
 			#{linkMan},
 			#{linkManIdentity},
 			#{contractPhone},
 			#{contractMobile},
 			#{fax},
-			#{zipCode},
-			#{linkMan1},
-			#{duty1},
-			#{contractPhone1},
-			#{contractMobile1},
-			#{contractQQ1},
-			#{wechat1},
-			#{contractEmail1},
-			#{linkMan2},
-			#{duty2},
-			#{contractPhone2},
-			#{contractMobile2},
-			#{contractQQ2},
-			#{wechat2},
-			#{contractEmail2},
-			#{scope},
-			#{info},
-			#{lng},
-			#{lat},
+		    #{info},
 			#{addTime},
-			#{favoriteTimes},
-			#{payFlag1},
 			#{auditTime},
 			#{auditNote},
 			#{status},
-			#{clubInvitationStatus},
-			#{recAddress},
 			#{businessLicenseImage},
-			#{sortIndex},
-			#{recTownID},
 			#{defaultServiceProviderID},
 			#{defaultServiceProviderUpdTime},
-			#{firstServiceProviderFlag},
-			#{scale},
-			#{empnum},
 			#{mainpro},
 			#{remark},
 			#{scanFlag},
@@ -381,24 +262,9 @@
 		<if test="sname != null">
 			sname = #{sname},
 			</if>
-		<if test="nameEn != null and nameEn != ''">
-			nameEn = #{nameEn},
-			</if>
-		<if test="site != null and site != ''">
-			site = #{site},
-			</if>
 		<if test="logo != null and logo != ''">
 			logo = #{logo},
 			</if>
-		<if test="level != null and level != ''">
-			level = #{level},
-			</if>
-		<if test="score != null and score != ''">
-			score = #{score},
-			</if>
-		<if test="subClubCount != null and subClubCount != ''">
-			subClubCount = #{subClubCount},
-			</if>
 		<if test="legalPerson != null and legalPerson != ''">
 			legalPerson = #{legalPerson},
 			</if>
@@ -411,9 +277,6 @@
 		<if test="townID != null and townID != ''">
 			townID = #{townID},
 			</if>
-		<if test="agreement != null and agreement != ''">
-			agreement = #{agreement},
-			</if>
 		<if test="flag != null and flag != ''">
 			flag = #{flag},
 			</if>
@@ -432,21 +295,9 @@
 		<if test="scanTime != null">
 			scanTime = #{scanTime},
 			</if>
-		<if test="checkTime != null and checkTime != ''">
-			checkTime = #{checkTime},
-			</if>
 		<if test="address != null and address != ''">
 			address = #{address},
 			</if>
-		<if test="registeredCapital != null and registeredCapital != ''">
-			registeredCapital = #{registeredCapital},
-			</if>
-		<if test="mainClubID != null and mainClubID != ''">
-			mainClubID = #{mainClubID},
-			</if>
-		<if test="turnover != null and turnover != ''">
-			turnover = #{turnover},
-			</if>
 		<if test="linkMan != null and linkMan != ''">
 			linkMan = #{linkMan},
 			</if>
@@ -462,72 +313,12 @@
 		<if test="fax != null and fax != ''">
 			fax = #{fax},
 			</if>
-		<if test="zipCode != null and zipCode != ''">
-			zipCode = #{zipCode},
-			</if>
-		<if test="linkMan1 != null and linkMan1 != ''">
-			linkMan1 = #{linkMan1},
-			</if>
-		<if test="duty1 != null and duty1 != ''">
-			duty1 = #{duty1},
-			</if>
-		<if test="contractPhone1 != null and contractPhone1 != ''">
-			contractPhone1 = #{contractPhone1},
-			</if>
-		<if test="contractMobile1 != null and contractMobile1 != ''">
-			contractMobile1 = #{contractMobile1},
-			</if>
-		<if test="contractQQ1 != null and contractQQ1 != ''">
-			contractQQ1 = #{contractQQ1},
-			</if>
-		<if test="wechat1 != null and wechat1 != ''">
-			wechat1 = #{wechat1},
-			</if>
-		<if test="contractEmail1 != null and contractEmail1 != ''">
-			contractEmail1 = #{contractEmail1},
-			</if>
-		<if test="linkMan2 != null and linkMan2 != ''">
-			linkMan2 = #{linkMan2},
-			</if>
-		<if test="duty2 != null and duty2 != ''">
-			duty2 = #{duty2},
-			</if>
-		<if test="contractPhone2 != null and contractPhone2 != ''">
-			contractPhone2 = #{contractPhone2},
-			</if>
-		<if test="contractMobile2 != null and contractMobile2 != ''">
-			contractMobile2 = #{contractMobile2},
-			</if>
-		<if test="contractQQ2 != null and contractQQ2 != ''">
-			contractQQ2 = #{contractQQ2},
-			</if>
-		<if test="wechat2 != null and wechat2 != ''">
-			wechat2 = #{wechat2},
-			</if>
-		<if test="contractEmail2 != null and contractEmail2 != ''">
-			contractEmail2 = #{contractEmail2},
-			</if>
-		<if test="scope != null and scope != ''">
-			scope = #{scope},
-			</if>
 		<if test="info != null and info != ''">
 			info = #{info},
 			</if>
-		<if test="lng != null and lng != ''">
-			lng = #{lng},
-			</if>
-		<if test="lat != null and lat != ''">
-			lat = #{lat},
-			</if>
 		<if test="addTime != null">
 			addTime = #{addTime},
 			</if>
-		<if test="favoriteTimes != null">
-			favoriteTimes = #{favoriteTimes},
-			</if>
-		<if test="payFlag1 != null and payFlag1 != ''">
-			payFlag1 = #{payFlag1},
-			</if>
 		<if test="auditTime != null">
 			auditTime = #{auditTime},
 			</if>
@@ -537,45 +328,21 @@
 		<if test="status != null and status != ''">
 			status = #{status},
 			</if>
-		<if test="clubInvitationStatus != null and clubInvitationStatus != ''">
-			clubInvitationStatus = #{clubInvitationStatus},
-			</if>
-		<if test="recAddress != null and recAddress != ''">
-			recAddress = #{recAddress},
-			</if>
 		<if test="businessLicenseImage != null">
 			businessLicenseImage = #{businessLicenseImage},
 		</if>
 		<if test="socialCreditCode != null and socialCreditCode != ''">
 			socialCreditCode = #{socialCreditCode},
 			</if>
-		<if test="sortIndex != null and sortIndex != ''">
-			sortIndex = #{sortIndex},
-			</if>
-		<if test="recTownID != null and recTownID != ''">
-			recTownID = #{recTownID},
-			</if>
 		<if test="defaultServiceProviderID != null and defaultServiceProviderID != ''">
 			defaultServiceProviderID = #{defaultServiceProviderID},
 			</if>
 		<if test="defaultServiceProviderUpdTime != null and defaultServiceProviderUpdTime != ''">
 			defaultServiceProviderUpdTime = #{defaultServiceProviderUpdTime},
 			</if>
-		<if test="firstServiceProviderFlag != null and firstServiceProviderFlag != ''">
-			firstServiceProviderFlag = #{firstServiceProviderFlag},
-			</if>
-		<if test="scale != null and scale != ''">
-			scale = #{scale},
-			</if>
-		<if test="empnum != null and empnum != ''">
-			empnum = #{empnum},
-			</if>
 		<if test="mainpro != null and mainpro != ''">
 			mainpro = #{mainpro},
 			</if>
-		<if test="remark != null and remark != ''">
-			remark = #{remark},
-			</if>
 		<if test="scanFlag != null and scanFlag != ''">
 			scanFlag = #{scanFlag},
 			</if>
@@ -622,7 +389,7 @@
 		select serviceProviderID from serviceprovider where serviceProviderID = #{spID} and status = 90
 	</select>
     <select id="findRemarksList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
-		select id as remarksId, remarks,s.linkMan1 as spName, ccr.addTime
+		select id as remarksId, remarks,s.linkMan as spName, ccr.addTime
 		from cm_club_remarks ccr
 		left join serviceprovider s on ccr.serviceProviderId = s.serviceProviderID
 		where clubId = #{clubId}