合并分支 'dxy' 到 'master'

src/main/java/com/wangxiaolu/promotion/domain/user/mapper/entity/QinCeClienteleStoreDO.java

@@ -239,6 +239,8 @@ public class QinCeClienteleStoreDO implements Serializable {
 
     private String storeSellingArea;
 
+    private String channelTheTypeExt;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
@@ -276,6 +278,9 @@ public class QinCeClienteleStoreDO implements Serializable {
             if ("门店面积".equals(extKey)) {
                 this.storeSellingArea = extValue;
             }
+            if ("渠道类型(点击问号查看分类说明)".equals(extKey)) {
+                this.channelTheTypeExt = extValue;
+            }
         }
         if (!isChain) {
             this.lineName = this.storeType;

src/main/resources/mapper/QinCeClienteleStoreMapper.xml

@@ -33,6 +33,7 @@
             <result property="storeModifierCode" column="store_modifier_code" jdbcType="VARCHAR"/>
             <result property="storeApprovalStatus" column="store_approval_status" jdbcType="CHAR"/>
             <result property="storeSellingArea" column="store_selling_area" jdbcType="VARCHAR"/>
+            <result property="channelTheTypeExt" column="channel_the_type_ext" jdbcType="VARCHAR"/>
             <result property="storeStatus" column="store_status" jdbcType="CHAR"/>
             <result property="createTime" column="create_time" jdbcType="CHAR"/>
     </resultMap>