供应商数据整理

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

@@ -20,12 +20,7 @@ public class NewCmShop extends DataEntity<NewCmShop> {
     private Integer userID;        // 对应的userId
     private String name;        // 名称
     private String sname;        // 供应商公司简称
-    private String nameEn;        // 英文名
-    private String site;        // 网站
     private String logo;        // 公司LOGO
-    private String level;        // level
-    private String score;        // 评分
-    private Integer productCount;        // productCount
     private String legalPerson;        // 法人
     private String businessLicense;        // businessLicense
     private String businessLicenseImage;        // 营业执照
@@ -43,51 +38,18 @@ public class NewCmShop extends DataEntity<NewCmShop> {
     private String contractMobile;        // 手机号
     private String fax;        // 传真
     private String zipCode;        // 邮编
-    private String linkMan1;        // 联系人1（默认联系人）
-    private String duty1;        // 联系人1职务
-    private String contractPhone1;        // 联系人1固定电话
-    private String contractMobile1;        // 联系人1手机号
-    private String contractQQ1;        // 联系人1QQ
-    private String wechat1;        // 联系人1微信
-    private String contractEmail1;        // 联系人1邮箱
-    private String linkMan2;        // 联系人2
-    private String duty2;        // 联系人2职务
-    private String contractPhone2;        // 联系人2固定电话
-    private String contractMobile2;        // 联系人2手机号
-    private String contractQQ2;        // 联系人2QQ
-    private String wechat2;        // 联系人2微信
-    private String contractEmail2;        // 联系人2邮箱
-    private String scope;        // scope
     private String info;        // 介绍
     private String productDesc;        // 主打产品说明
     private String website;     // 网址
     private String wxOfficialAccount;   //微信公众号
     private String wxApplets;       //微信小程序
-    private Double lng;        // lng
-    private Double lat;        // lat
     private String addTime;        // 添加时间
     private String auditStatus;        // 审核状态
     private String auditTime;        // 审核时间
     private String auditNote;        // 审核信息
-    private Integer favoriteTimes;        // 被收藏次数
     private String validFlag;        // 是否可用，1可用
-    private String payFlag1;        // payFlag1
-    private String auditFlag1;        // auditFlag1
-    private String payFlag2;        // payFlag2
-    private String auditFlag2;        // auditFlag2
-    private String payFlag3;        // payFlag3
-    private String auditFlag3;        // auditFlag3
     private String note;        // note
     private Integer status;        // 供应商状态，见表c_shopstatus或枚举ShopStatus
-    private Integer sortIndex;        // sortIndex
-    private Double rate1;        // rate1
-    private Double rate2;        // rate2
-    private String masterFlag;        // masterFlag
-    private String erpFlag;        // erpFlag
-    private String shopSecret;        // shopSecret
-    private String masterLogo;        // masterLogo
-    private String cooperateFlag;        // cooperateFlag
-    private Integer bail;        // bail
     private String businessScope;        // 经营范围
     private String firstShopType;
     private String secondShopType;
@@ -172,23 +134,23 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         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() {
@@ -199,29 +161,29 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.logo = logo;
     }
 
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public String getScore() {
-        return score;
-    }
-
-    public void setScore(String score) {
-        this.score = score;
-    }
-
-    public Integer getProductCount() {
-        return productCount;
-    }
-
-    public void setProductCount(Integer productCount) {
-        this.productCount = productCount;
-    }
+//    public String getLevel() {
+//        return level;
+//    }
+//
+//    public void setLevel(String level) {
+//        this.level = level;
+//    }
+//
+//    public String getScore() {
+//        return score;
+//    }
+//
+//    public void setScore(String score) {
+//        this.score = score;
+//    }
+//
+//    public Integer getProductCount() {
+//        return productCount;
+//    }
+//
+//    public void setProductCount(Integer productCount) {
+//        this.productCount = productCount;
+//    }
 
     @Length(min = 0, max = 20, message = "法人长度必须介于 0 和 20 之间")
     public String getLegalPerson() {
@@ -355,140 +317,140 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.zipCode = zipCode;
     }
 
-    @Length(min = 0, max = 50, message = "联系人1（默认联系人）长度必须介于 0 和 50 之间")
-    public String getLinkMan1() {
-        return linkMan1;
-    }
-
-    public void setLinkMan1(String linkMan1) {
-        this.linkMan1 = linkMan1;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人1职务长度必须介于 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 = "联系人1QQ长度必须介于 0 和 20 之间")
-    public String getContractQQ1() {
-        return contractQQ1;
-    }
-
-    public void setContractQQ1(String contractQQ1) {
-        this.contractQQ1 = contractQQ1;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人1微信长度必须介于 0 和 50 之间")
-    public String getWechat1() {
-        return wechat1;
-    }
-
-    public void setWechat1(String wechat1) {
-        this.wechat1 = wechat1;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人1邮箱长度必须介于 0 和 50 之间")
-    public String getContractEmail1() {
-        return contractEmail1;
-    }
-
-    public void setContractEmail1(String contractEmail1) {
-        this.contractEmail1 = contractEmail1;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人2长度必须介于 0 和 50 之间")
-    public String getLinkMan2() {
-        return linkMan2;
-    }
-
-    public void setLinkMan2(String linkMan2) {
-        this.linkMan2 = linkMan2;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人2职务长度必须介于 0 和 50 之间")
-    public String getDuty2() {
-        return duty2;
-    }
-
-    public void setDuty2(String duty2) {
-        this.duty2 = duty2;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人2固定电话长度必须介于 0 和 50 之间")
-    public String getContractPhone2() {
-        return contractPhone2;
-    }
-
-    public void setContractPhone2(String contractPhone2) {
-        this.contractPhone2 = contractPhone2;
-    }
-
-    @Length(min = 0, max = 20, message = "联系人2手机号长度必须介于 0 和 20 之间")
-    public String getContractMobile2() {
-        return contractMobile2;
-    }
-
-    public void setContractMobile2(String contractMobile2) {
-        this.contractMobile2 = contractMobile2;
-    }
-
-    @Length(min = 0, max = 20, message = "联系人2QQ长度必须介于 0 和 20 之间")
-    public String getContractQQ2() {
-        return contractQQ2;
-    }
-
-    public void setContractQQ2(String contractQQ2) {
-        this.contractQQ2 = contractQQ2;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人2微信长度必须介于 0 和 50 之间")
-    public String getWechat2() {
-        return wechat2;
-    }
-
-    public void setWechat2(String wechat2) {
-        this.wechat2 = wechat2;
-    }
-
-    @Length(min = 0, max = 50, message = "联系人2邮箱长度必须介于 0 和 50 之间")
-    public String getContractEmail2() {
-        return contractEmail2;
-    }
-
-    public void setContractEmail2(String contractEmail2) {
-        this.contractEmail2 = contractEmail2;
-    }
-
-    @Length(min = 0, max = 100, message = "scope长度必须介于 0 和 100 之间")
-    public String getScope() {
-        return scope;
-    }
-
-    public void setScope(String scope) {
-        this.scope = scope;
-    }
+//    @Length(min = 0, max = 50, message = "联系人1（默认联系人）长度必须介于 0 和 50 之间")
+//    public String getLinkMan1() {
+//        return linkMan1;
+//    }
+//
+//    public void setLinkMan1(String linkMan1) {
+//        this.linkMan1 = linkMan1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人1职务长度必须介于 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 = "联系人1QQ长度必须介于 0 和 20 之间")
+//    public String getContractQQ1() {
+//        return contractQQ1;
+//    }
+//
+//    public void setContractQQ1(String contractQQ1) {
+//        this.contractQQ1 = contractQQ1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人1微信长度必须介于 0 和 50 之间")
+//    public String getWechat1() {
+//        return wechat1;
+//    }
+//
+//    public void setWechat1(String wechat1) {
+//        this.wechat1 = wechat1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人1邮箱长度必须介于 0 和 50 之间")
+//    public String getContractEmail1() {
+//        return contractEmail1;
+//    }
+//
+//    public void setContractEmail1(String contractEmail1) {
+//        this.contractEmail1 = contractEmail1;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人2长度必须介于 0 和 50 之间")
+//    public String getLinkMan2() {
+//        return linkMan2;
+//    }
+//
+//    public void setLinkMan2(String linkMan2) {
+//        this.linkMan2 = linkMan2;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人2职务长度必须介于 0 和 50 之间")
+//    public String getDuty2() {
+//        return duty2;
+//    }
+//
+//    public void setDuty2(String duty2) {
+//        this.duty2 = duty2;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人2固定电话长度必须介于 0 和 50 之间")
+//    public String getContractPhone2() {
+//        return contractPhone2;
+//    }
+//
+//    public void setContractPhone2(String contractPhone2) {
+//        this.contractPhone2 = contractPhone2;
+//    }
+//
+//    @Length(min = 0, max = 20, message = "联系人2手机号长度必须介于 0 和 20 之间")
+//    public String getContractMobile2() {
+//        return contractMobile2;
+//    }
+//
+//    public void setContractMobile2(String contractMobile2) {
+//        this.contractMobile2 = contractMobile2;
+//    }
+//
+//    @Length(min = 0, max = 20, message = "联系人2QQ长度必须介于 0 和 20 之间")
+//    public String getContractQQ2() {
+//        return contractQQ2;
+//    }
+//
+//    public void setContractQQ2(String contractQQ2) {
+//        this.contractQQ2 = contractQQ2;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人2微信长度必须介于 0 和 50 之间")
+//    public String getWechat2() {
+//        return wechat2;
+//    }
+//
+//    public void setWechat2(String wechat2) {
+//        this.wechat2 = wechat2;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "联系人2邮箱长度必须介于 0 和 50 之间")
+//    public String getContractEmail2() {
+//        return contractEmail2;
+//    }
+//
+//    public void setContractEmail2(String contractEmail2) {
+//        this.contractEmail2 = contractEmail2;
+//    }
+//
+//    @Length(min = 0, max = 100, message = "scope长度必须介于 0 和 100 之间")
+//    public String getScope() {
+//        return scope;
+//    }
+//
+//    public void setScope(String scope) {
+//        this.scope = scope;
+//    }
 
     @Length(min = 0, max = 5000, message = "介绍长度必须介于 0 和 5000 之间")
     public String getInfo() {
@@ -508,21 +470,21 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.productDesc = productDesc;
     }
 
-    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;
+//    }
 
     @Length(min = 0, max = 19, message = "添加时间长度必须介于 0 和 19 之间")
     public String getAddTime() {
@@ -560,13 +522,13 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.auditNote = auditNote;
     }
 
-    public Integer getFavoriteTimes() {
-        return favoriteTimes;
-    }
-
-    public void setFavoriteTimes(Integer favoriteTimes) {
-        this.favoriteTimes = favoriteTimes;
-    }
+//    public Integer getFavoriteTimes() {
+//        return favoriteTimes;
+//    }
+//
+//    public void setFavoriteTimes(Integer favoriteTimes) {
+//        this.favoriteTimes = favoriteTimes;
+//    }
 
     @Length(min = 0, max = 1, message = "是否可用，1可用长度必须介于 0 和 1 之间")
     public String getValidFlag() {
@@ -577,59 +539,59 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.validFlag = validFlag;
     }
 
-    @Length(min = 0, max = 1, message = "payFlag1长度必须介于 0 和 1 之间")
-    public String getPayFlag1() {
-        return payFlag1;
-    }
-
-    public void setPayFlag1(String payFlag1) {
-        this.payFlag1 = payFlag1;
-    }
-
-    @Length(min = 0, max = 1, message = "auditFlag1长度必须介于 0 和 1 之间")
-    public String getAuditFlag1() {
-        return auditFlag1;
-    }
-
-    public void setAuditFlag1(String auditFlag1) {
-        this.auditFlag1 = auditFlag1;
-    }
-
-    @Length(min = 0, max = 1, message = "payFlag2长度必须介于 0 和 1 之间")
-    public String getPayFlag2() {
-        return payFlag2;
-    }
-
-    public void setPayFlag2(String payFlag2) {
-        this.payFlag2 = payFlag2;
-    }
-
-    @Length(min = 0, max = 1, message = "auditFlag2长度必须介于 0 和 1 之间")
-    public String getAuditFlag2() {
-        return auditFlag2;
-    }
-
-    public void setAuditFlag2(String auditFlag2) {
-        this.auditFlag2 = auditFlag2;
-    }
-
-    @Length(min = 0, max = 1, message = "payFlag3长度必须介于 0 和 1 之间")
-    public String getPayFlag3() {
-        return payFlag3;
-    }
-
-    public void setPayFlag3(String payFlag3) {
-        this.payFlag3 = payFlag3;
-    }
-
-    @Length(min = 0, max = 1, message = "auditFlag3长度必须介于 0 和 1 之间")
-    public String getAuditFlag3() {
-        return auditFlag3;
-    }
-
-    public void setAuditFlag3(String auditFlag3) {
-        this.auditFlag3 = auditFlag3;
-    }
+//    @Length(min = 0, max = 1, message = "payFlag1长度必须介于 0 和 1 之间")
+//    public String getPayFlag1() {
+//        return payFlag1;
+//    }
+//
+//    public void setPayFlag1(String payFlag1) {
+//        this.payFlag1 = payFlag1;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "auditFlag1长度必须介于 0 和 1 之间")
+//    public String getAuditFlag1() {
+//        return auditFlag1;
+//    }
+//
+//    public void setAuditFlag1(String auditFlag1) {
+//        this.auditFlag1 = auditFlag1;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "payFlag2长度必须介于 0 和 1 之间")
+//    public String getPayFlag2() {
+//        return payFlag2;
+//    }
+//
+//    public void setPayFlag2(String payFlag2) {
+//        this.payFlag2 = payFlag2;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "auditFlag2长度必须介于 0 和 1 之间")
+//    public String getAuditFlag2() {
+//        return auditFlag2;
+//    }
+//
+//    public void setAuditFlag2(String auditFlag2) {
+//        this.auditFlag2 = auditFlag2;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "payFlag3长度必须介于 0 和 1 之间")
+//    public String getPayFlag3() {
+//        return payFlag3;
+//    }
+//
+//    public void setPayFlag3(String payFlag3) {
+//        this.payFlag3 = payFlag3;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "auditFlag3长度必须介于 0 和 1 之间")
+//    public String getAuditFlag3() {
+//        return auditFlag3;
+//    }
+//
+//    public void setAuditFlag3(String auditFlag3) {
+//        this.auditFlag3 = auditFlag3;
+//    }
 
     @Length(min = 0, max = 200, message = "note长度必须介于 0 和 200 之间")
     public String getNote() {
@@ -648,82 +610,82 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.status = status;
     }
 
-    public Integer getSortIndex() {
-        return sortIndex;
-    }
-
-    public void setSortIndex(Integer sortIndex) {
-        this.sortIndex = sortIndex;
-    }
-
-    public Double getRate1() {
-        return rate1;
-    }
-
-    public void setRate1(Double rate1) {
-        this.rate1 = rate1;
-    }
-
-    public Double getRate2() {
-        return rate2;
-    }
-
-    public void setRate2(Double rate2) {
-        this.rate2 = rate2;
-    }
-
-    @Length(min = 0, max = 1, message = "masterFlag长度必须介于 0 和 1 之间")
-    public String getMasterFlag() {
-        return masterFlag;
-    }
-
-    public void setMasterFlag(String masterFlag) {
-        this.masterFlag = masterFlag;
-    }
-
-    @Length(min = 0, max = 1, message = "erpFlag长度必须介于 0 和 1 之间")
-    public String getErpFlag() {
-        return erpFlag;
-    }
-
-    public void setErpFlag(String erpFlag) {
-        this.erpFlag = erpFlag;
-    }
-
-    @Length(min = 0, max = 50, message = "shopSecret长度必须介于 0 和 50 之间")
-    public String getShopSecret() {
-        return shopSecret;
-    }
-
-    public void setShopSecret(String shopSecret) {
-        this.shopSecret = shopSecret;
-    }
-
-    @Length(min = 0, max = 200, message = "masterLogo长度必须介于 0 和 200 之间")
-    public String getMasterLogo() {
-        return masterLogo;
-    }
-
-    public void setMasterLogo(String masterLogo) {
-        this.masterLogo = masterLogo;
-    }
-
-    @Length(min = 0, max = 1, message = "cooperateFlag长度必须介于 0 和 1 之间")
-    public String getCooperateFlag() {
-        return cooperateFlag;
-    }
-
-    public void setCooperateFlag(String cooperateFlag) {
-        this.cooperateFlag = cooperateFlag;
-    }
-
-    public Integer getBail() {
-        return bail;
-    }
-
-    public void setBail(Integer bail) {
-        this.bail = bail;
-    }
+//    public Integer getSortIndex() {
+//        return sortIndex;
+//    }
+//
+//    public void setSortIndex(Integer sortIndex) {
+//        this.sortIndex = sortIndex;
+//    }
+//
+//    public Double getRate1() {
+//        return rate1;
+//    }
+//
+//    public void setRate1(Double rate1) {
+//        this.rate1 = rate1;
+//    }
+//
+//    public Double getRate2() {
+//        return rate2;
+//    }
+//
+//    public void setRate2(Double rate2) {
+//        this.rate2 = rate2;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "masterFlag长度必须介于 0 和 1 之间")
+//    public String getMasterFlag() {
+//        return masterFlag;
+//    }
+//
+//    public void setMasterFlag(String masterFlag) {
+//        this.masterFlag = masterFlag;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "erpFlag长度必须介于 0 和 1 之间")
+//    public String getErpFlag() {
+//        return erpFlag;
+//    }
+//
+//    public void setErpFlag(String erpFlag) {
+//        this.erpFlag = erpFlag;
+//    }
+//
+//    @Length(min = 0, max = 50, message = "shopSecret长度必须介于 0 和 50 之间")
+//    public String getShopSecret() {
+//        return shopSecret;
+//    }
+//
+//    public void setShopSecret(String shopSecret) {
+//        this.shopSecret = shopSecret;
+//    }
+//
+//    @Length(min = 0, max = 200, message = "masterLogo长度必须介于 0 和 200 之间")
+//    public String getMasterLogo() {
+//        return masterLogo;
+//    }
+//
+//    public void setMasterLogo(String masterLogo) {
+//        this.masterLogo = masterLogo;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "cooperateFlag长度必须介于 0 和 1 之间")
+//    public String getCooperateFlag() {
+//        return cooperateFlag;
+//    }
+//
+//    public void setCooperateFlag(String cooperateFlag) {
+//        this.cooperateFlag = cooperateFlag;
+//    }
+//
+//    public Integer getBail() {
+//        return bail;
+//    }
+//
+//    public void setBail(Integer bail) {
+//        this.bail = bail;
+//    }
 
     @Length(min = 0, max = 255, message = "经营范围长度必须介于 0 和 255 之间")
     public String getBusinessScope() {

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

@@ -7,12 +7,7 @@
 		a.userID AS "userID",
 		u.name AS "name",
 		u.userName AS "sname",
-		a.nameEn AS "nameEn",
-		a.site AS "site",
 		a.logo AS "logo",
-		a.level AS "level",
-		a.score AS "score",
-		a.productCount AS "productCount",
 		a.legalPerson AS "legalPerson",
 		a.businessLicense AS "businessLicense",
 		a.businessLicenseImage AS "businessLicenseImage",
@@ -30,53 +25,19 @@
 		u.bindMobile AS "contractMobile",
 		a.fax AS "fax",
 		a.zipCode AS "zipCode",
-		a.linkMan AS "linkMan1",
-		a.duty1 AS "duty1",
-		a.contractPhone1 AS "contractPhone1",
-		u.bindMobile 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.productDesc AS "productDesc",
 		a.website,
 		a.wxOfficialAccount,
 		a.wxApplets,
-		a.lng AS "lng",
-		a.lat AS "lat",
 		a.addTime AS "addTime",
 		a.auditStatus AS "auditStatus",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
-		a.favoriteTimes AS "favoriteTimes",
 		a.validFlag AS "validFlag",
-		a.payFlag1 AS "payFlag1",
-		a.auditFlag1 AS "auditFlag1",
-		a.payFlag2 AS "payFlag2",
-		a.auditFlag2 AS "auditFlag2",
-		a.payFlag3 AS "payFlag3",
-		a.auditFlag3 AS "auditFlag3",
-		a.note AS "note",
 		a.status AS "status",
 		a.maintenanceFee AS "maintenanceFee",
 		a.maintenanceDate AS "maintenanceDate",
-		a.sortIndex AS "sortIndex",
-		a.rate1 AS "rate1",
-		a.rate2 AS "rate2",
-		a.masterFlag AS "masterFlag",
-		a.erpFlag AS "erpFlag",
-		a.shopSecret AS "shopSecret",
-		a.masterLogo AS "masterLogo",
-		a.cooperateFlag AS "cooperateFlag",
-		a.bail AS "bail",
 		a.businessScope AS "businessScope",
 		u.account AS "account",
 		u.registerTime AS "registerTime",
@@ -140,18 +101,12 @@
 			<if test="contractMobile != null and contractMobile != ''">
 				AND a.contractMobile = #{contractMobile}
 			</if>
-			<if test="contractMobile1 != null and contractMobile1 != ''">
-				AND a.contractMobile1 = #{contractMobile1}
-			</if>
 			<if test="linkMan != null and linkMan != ''">
 				AND a.linkMan LIKE
 				<if test="dbName == 'oracle'">'%'||#{linkMan}||'%'</if>
 				<if test="dbName == 'mssql'">'%'+#{linkMan}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{linkMan},'%')</if>
 			</if>
-			<if test="linkMan1 != null and linkMan1 != ''">
-				AND a.linkMan1 LIKE concat('%',#{linkMan1},'%')
-			</if>
 			<if test="startTime != null and startTime != ''">
 				AND (u.registerTime &gt; #{startTime} OR  u.registerTime = #{startTime})
 			</if>
@@ -220,12 +175,7 @@
 			userID,
 			name,
 			sname,
-			nameEn,
-			site,
 			logo,
-			level,
-			score,
-			productCount,
 			legalPerson,
 			businessLicense,
 			businessLicenseImage,
@@ -243,50 +193,16 @@
 			contractMobile,
 			fax,
 			zipCode,
-			linkMan1,
-			duty1,
-			contractPhone1,
-			contractMobile1,
-			contractQQ1,
-			wechat1,
-			contractEmail1,
-			linkMan2,
-			duty2,
-			contractPhone2,
-			contractMobile2,
-			contractQQ2,
-			wechat2,
-			contractEmail2,
-			scope,
 			info,
 			productDesc,
-			lng,
-			lat,
 			addTime,
 			auditStatus,
 			auditTime,
 			auditNote,
-			favoriteTimes,
 			validFlag,
-			payFlag1,
-			auditFlag1,
-			payFlag2,
-			auditFlag2,
-			payFlag3,
-			auditFlag3,
-			note,
 			status,
 			maintenanceFee,
 			maintenanceDate,
-			sortIndex,
-			rate1,
-			rate2,
-			masterFlag,
-			erpFlag,
-			shopSecret,
-			masterLogo,
-			cooperateFlag,
-			bail,
 			businessScope,
 			firstShopType,
 			secondShopType,
@@ -299,12 +215,7 @@
 			#{userID},
 			#{name},
 			#{sname},
-			#{nameEn},
-			#{site},
 			#{logo},
-			#{level},
-			#{score},
-			#{productCount},
 			#{legalPerson},
 			#{businessLicense},
 			#{businessLicenseImage},
@@ -322,50 +233,16 @@
 			#{contractMobile},
 			#{fax},
 			#{zipCode},
-			#{linkMan1},
-			#{duty1},
-			#{contractPhone1},
-			#{contractMobile1},
-			#{contractQQ1},
-			#{wechat1},
-			#{contractEmail1},
-			#{linkMan2},
-			#{duty2},
-			#{contractPhone2},
-			#{contractMobile2},
-			#{contractQQ2},
-			#{wechat2},
-			#{contractEmail2},
-			#{scope},
 			#{info},
 			#{productDesc},
-			#{lng},
-			#{lat},
 			#{addTime},
 			#{auditStatus},
 			#{auditTime},
 			#{auditNote},
-			#{favoriteTimes},
 			#{validFlag},
-			#{payFlag1},
-			#{auditFlag1},
-			#{payFlag2},
-			#{auditFlag2},
-			#{payFlag3},
-			#{auditFlag3},
-			#{note},
 			#{status},
 			#{maintenanceFee},
 			#{maintenanceDate},
-			#{sortIndex},
-			#{rate1},
-			#{rate2},
-			#{masterFlag},
-			#{erpFlag},
-			#{shopSecret},
-			#{masterLogo},
-			#{cooperateFlag},
-			#{bail},
 			#{businessScope},
 			#{firstShopType},
 			#{secondShopType},
@@ -387,12 +264,6 @@
 			<if test="sname != null and sname != ''" >
 				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>
@@ -438,60 +309,12 @@
 			<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="productDesc != null and productDesc != ''" >
 				productDesc = #{productDesc},
 			</if>
-			<if test="favoriteTimes != null and favoriteTimes != ''" >
-				favoriteTimes = #{favoriteTimes},
-			</if>
 			<if test="status != null and status != ''" >
 				status = #{status},
 			</if>
@@ -510,9 +333,6 @@
 			<if test="maintenanceDate != null and maintenanceDate != ''" >
 				maintenanceDate = #{maintenanceDate},
 			</if>
-			<if test="bail != null and bail != ''" >
-				bail = #{bail},
-			</if>
 			<if test="businessScope != null and businessScope != ''" >
 				businessScope = #{businessScope},
 			</if>