合并分支 'dxy' 到 'qa'

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

@@ -29,9 +29,9 @@ public class WxTemporaryInfoDelayDO {
     private String storeName;
 
     /**
-     * 门店地址
+     * 门店编码
      */
-    private String storeAddress;
+    private String storeCode;
 
     /**
      * 联系电话

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/WxTemporaryInfoDelayDtO.java

@@ -30,7 +30,7 @@ public class WxTemporaryInfoDelayDtO {
     /**
      * 门店地址
      */
-    private String storeAddress;
+    private String storeCode;
 
     /**
      * 联系电话

src/main/resources/mapper/WxTemporaryInfoDelayMapper.xml

@@ -6,7 +6,7 @@
             <id column="id" property="id"/> <!-- 主键映射 -->
             <result column="open_id" property="openId"/> <!-- 数据库下划线 → Java驼峰 -->
             <result column="store_name" property="storeName"/>
-            <result column="store_address" property="storeAddress"/>
+            <result column="store_address" property="storeCode"/>
             <result column="contact_phone" property="contactPhone"/>
             <result column="create_time" property="createTime"/>
             <result column="is_processed" property="isProcessed"/>
@@ -16,7 +16,7 @@
         <!-- 查询指定时间范围未处理的数据（使用resultMap） -->
         <select id="selectByTimeAndStatus" resultMap="WxTemporaryInfoDelayResultMap">
             SELECT
-                id, open_id, store_name, store_address, contact_phone,
+                id, open_id, store_name, store_code, contact_phone,
                 create_time, is_processed, update_time
             FROM wx_temporary_info_delay
             WHERE create_time BETWEEN #{startTime} AND #{endTime}
@@ -36,10 +36,10 @@
         <!-- 单条插入（适配已有实体，可选：MyBatis-Plus也可自动生成） -->
         <insert id="insert" parameterType="com.wangxiaolu.promotion.domain.user.mapper.entity.WxTemporaryInfoDelayDO">
             INSERT INTO wx_temporary_info_delay (
-                open_id, store_name, store_address, contact_phone,
+                open_id, store_name, store_code, contact_phone,
                 create_time, is_processed, update_time
             ) VALUES (
-                         #{openId}, #{storeName}, #{storeAddress}, #{contactPhone},
+                         #{openId}, #{storeName}, #{storeCode}, #{contactPhone},
                          NOW(), 0, NOW()
                      )
         </insert>