合并分支 'dxy' 到 'qa'

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

@@ -236,6 +236,9 @@ public class QinCeClienteleStoreDO implements Serializable {
     private String cooperationModeExt;
     //    渠道小类  -->>  渠道类型
     private String channelTypeExt;
+    
+    @JsonProperty("store_selling_area")
+    private String storeSellingArea;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/wangxiaolu/promotion/pojo/user/dto/QinCeClienteleStoreDto.java

@@ -25,4 +25,5 @@ public class QinCeClienteleStoreDto {
     private String storeMssCity;
     private String storeMssArea;
     private String storeAddr;
+    private String storeSellingarea;
 }

src/main/resources/mapper/QinCeClienteleStoreMapper.xml

@@ -32,6 +32,7 @@
             <result property="storeCreatorCode" column="store_creator_code" jdbcType="VARCHAR"/>
             <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="storeStatus" column="store_status" jdbcType="CHAR"/>
             <result property="createTime" column="create_time" jdbcType="CHAR"/>
     </resultMap>