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

# Conflicts:
#	src/main/java/com/caimei/modules/user/entity/CmUser.java

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

@@ -94,7 +94,8 @@ public class CmUser extends DataEntity<CmUser> {
     private String account;//账号名： 企业账号登录使用
     private Integer userIdentity;//用户身份
     private String realName;//真实姓名
-//    private Integer companyUserID;//企业用户id
+    private Integer companyUserID;//企业用户id
+    private String openID;//微信openID
     private String bindMobile;//企业绑定手机号
     private String tipStatus;//弹窗提示状态
     private String identityDisplay; //前台身份展示
@@ -109,8 +110,6 @@ public class CmUser extends DataEntity<CmUser> {
     private String shortName;   //机构简称
     private String userIds;  //用户id","隔开
     private boolean storeStatus = false; //是否存在数据库
-    private String openID;//呵呵商城用户微信openID
-
 
     public CmUser() {
         super();
@@ -708,21 +707,21 @@ public class CmUser extends DataEntity<CmUser> {
         this.realName = realName;
     }
 
-//    public Integer getCompanyUserID() {
-//        return companyUserID;
-//    }
-//
-//    public void setCompanyUserID(Integer companyUserID) {
-//        this.companyUserID = companyUserID;
-//    }
-//
-//    public String getOpenID() {
-//        return openID;
-//    }
-//
-//    public void setOpenID(String openID) {
-//        this.openID = openID;
-//    }
+    public Integer getCompanyUserID() {
+        return companyUserID;
+    }
+
+    public void setCompanyUserID(Integer companyUserID) {
+        this.companyUserID = companyUserID;
+    }
+
+    public String getOpenID() {
+        return openID;
+    }
+
+    public void setOpenID(String openID) {
+        this.openID = openID;
+    }
 
     public String getBindMobile() {
         return bindMobile;
@@ -862,12 +861,4 @@ public class CmUser extends DataEntity<CmUser> {
     public void setStoreStatus(boolean storeStatus) {
         this.storeStatus = storeStatus;
     }
-
-    public String getOpenID() {
-        return openID;
-    }
-
-    public void setOpenID(String openID) {
-        this.openID = openID;
-    }
 }

src/main/resources/mappings/modules/hehe/HeHeNewOrderMapper.xml

@@ -25,15 +25,11 @@
 		a.note AS note,
 		a.clubID AS clubID,
 		a.clubScanTime AS clubScanTime,
-		a.payWay AS payWay,
 		a.orderSource AS orderSource,
 		a.orderTime AS orderTime,
 		a.confirmTime AS confirmTime,
 		a.productCount AS productCount,
 		a.presentCount AS presentCount,
-		a.cooFreeFlag AS cooFreeFlag,
-		a.cooFreeRate AS cooFreeRate,
-		a.cooFreeAmount AS cooFreeAmount,
 		a.confirmFlag AS confirmFlag,
 		a.clauseID AS clauseID,
 		a.clauseContent AS clauseContent,
@@ -81,7 +77,6 @@
         <result column="alreadyReceipt" property="alreadyReceipt"/>
         <result column="unReceipt" property="unReceipt"/>
         <result column="payTotalFee" property="payTotalFee"/>
-        <result column="payWay" property="payWay"/>
         <result column="status" property="status"/>
         <collection property="newShopOrders" ofType="com.caimei.modules.order.entity.NewShopOrder"
                     select="loadShopOrders" column="orderNo" fetchType="eager">