合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/mapper/entity/ActivityPlanInfoDo.java

@@ -161,14 +161,23 @@ public class ActivityPlanInfoDo implements Serializable {
 //    private BigDecimal incidentals;
 
     /**
-     * 是否有试吃台
+     * 门店是否已配试吃台
      */
     private String temWlSct;
     /**
-     * 活动品项：老品/黑鸭/散称
+     * 活动品项：老品/黑鸭/散称/礼盒
      */
     private String prdClass;
 
+    /**
+     * 活动执行方式：经销商/第三方
+     */
+    private String planExecuteMode;
+
+    /**
+     * 门店是否允许使用试吃台
+     */
+    private String isCanUseTasteCounter;
     /**
      * 是否执行：1:执行；0：未执行；
      */

src/main/resources/mapper/activityplanv2/ActivityPlanInfoMapper.xml

@@ -68,7 +68,7 @@
 
     <insert id="saveList">
         INSERT INTO activity_plan_info
-        (plan_file_id,employee_id,employee_name,employee_no,year,month,date,line_name,store_name,store_code,org_qc_id,org_name,pattern_id,pattern,dealer_id,dealer_name,both_t,province,city,area,addr,clock_in_time,clock_out_time,noon_clock_out_time,noon_clock_in_time,tem_wl_sct,prd_class,create_by)
+        (plan_file_id,employee_id,employee_name,employee_no,year,month,date,line_name,store_name,store_code,org_qc_id,org_name,pattern_id,pattern,dealer_id,dealer_name,both_t,province,city,area,addr,clock_in_time,clock_out_time,noon_clock_out_time,noon_clock_in_time,tem_wl_sct,prd_class,create_by,plan_execute_mode,is_can_use_taste_counter)
         VALUES
         <foreach collection="table" item="item" index="index" separator=",">
             (#{recordId}, #{item.employeeId}, #{item.employeeName}, #{item.employeeNo}, #{item.year},
@@ -76,7 +76,7 @@
             #{item.orgQcId},#{item.orgName}, 0, #{item.pattern}, #{item.dealerId}, #{item.dealerName}, '未确定',
             #{item.province}, #{item.city}, #{item.area}, #{item.addr},
             FROM_UNIXTIME(#{item.clockInTime} / 1000), FROM_UNIXTIME(#{item.clockOutTime} / 1000), FROM_UNIXTIME(#{item.noonClockOutTime} / 1000),
-            FROM_UNIXTIME(#{item.noonClockInTime} / 1000),#{item.temWlSct},#{item.prdClass},#{item.createBy})
+            FROM_UNIXTIME(#{item.noonClockInTime} / 1000),#{item.temWlSct},#{item.prdClass},#{item.createBy}, #{item.planExecuteMode}, #{item.isCanUseTasteCounter})
         </foreach>
     </insert>