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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserCashAccount.java

@@ -57,7 +57,7 @@ public class SysUserCashAccount extends BaseEntity {
 
 	public SysUserCashAccount(Integer userId,Integer tenantId, String currency) {
 		this.userId = userId;
-		this.setTenantId(tenantId);
+        super.setTenantId(tenantId);
 		this.currency = currency;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantOrderRecord.java

@@ -57,7 +57,7 @@ public class TenantOrderRecord implements Serializable {
     @ApiModelProperty(value = "实付金额")
     private BigDecimal actualAmount;
 
-    @TableField("mer_nos")
+    @TableField("mer_nos_")
     @ApiModelProperty(value = "收款账户")
     private String merNos;
 

mec-biz/src/main/resources/config/mybatis/TenantOrderRecordMapper.xml

@@ -11,7 +11,7 @@
         <result column="pay_channel_" jdbcType="VARCHAR" property="payChannel"/>
         <result column="expect_amount" jdbcType="VARCHAR" property="expectAmount"/>
         <result column="actual_amount" jdbcType="VARCHAR" property="actualAmount"/>
-        <result column="mer_nos" jdbcType="VARCHAR" property="merNos"/>
+        <result column="mer_nos_" jdbcType="VARCHAR" property="merNos"/>
         <result column="order_state_" jdbcType="INTEGER" property="orderState"/>
         <result column="pay_date_" jdbcType="TIMESTAMP" property="payDate"/>
         <result column="pay_time_" jdbcType="TIMESTAMP" property="payTime"/>
@@ -20,13 +20,13 @@
 
     <sql id="Base_Column_List">
         id_
-        , tenant_id_, order_no_, trans_no_, order_type_, payment_channel_, pay_channel_, expect_amount, actual_amount, mer_nos, order_state_, pay_date_, pay_time_, created_time_
+        , tenant_id_, order_no_, trans_no_, order_type_, payment_channel_, pay_channel_, expect_amount, actual_amount, mer_nos_, order_state_, pay_date_, pay_time_, created_time_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.ym.mec.biz.dal.entity.TenantOrderRecord">
         insert into tenant_order_record(tenant_id_, order_no_, trans_no_, order_type_, payment_channel_, pay_channel_,
-        expect_amount, actual_amount, mer_nos,order_state_, pay_date_, pay_time_, created_time_)
+        expect_amount, actual_amount, mer_nos_,order_state_, pay_date_, pay_time_, created_time_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.tenantId}, #{entity.orderNo}, #{entity.transNo}, #{entity.orderType}, #{entity.paymentChannel},