合并分支 'qa' 到 'master'

src/main/java/com/wangxiaolu/promotion/common/constant/WechatConstants.java

@@ -8,5 +8,5 @@ public class WechatConstants {
     /**
      * 随机任务跳转页面
      */
-    public static final String RANDOM_TASK_URL = "/pages/mine/index";
+    public static final String RANDOM_TASK_URL = "/pages/task/index";
  }

src/main/java/com/wangxiaolu/promotion/result/basedata/RCode.java

@@ -93,6 +93,10 @@ public enum RCode implements StatusCode {
     QINCE_STORE_DEALER_ERROR(4026, "所属经销商与修改前不一致，请重新选择"),
     ACTIVITY_PLAN_DATETIME_ERROR(4027, "时间错误，正确规则：上班时间<午休下班时间<午休上班时间<下班时间；"),
     NOT_POS_TASK_PHOTO_ERROR(4028, "不拍 POS 照场次费用扣减 10 "),
+    NOT_SCP_PHOTO_ERROR(4029,"试吃品数量照片未上传"),
+    NOT_PFZP_PHOTO_ERROR(4030,"配发赠品照片未上传"),
+    NOT_GFQ_PHOTO_ERROR( 4031,"高峰期在岗照片未上传"),
+    NOT_SCBBWL_PHOTO_ERROR( 4032,"试吃必备物料照片未上传"),
 
 
     /**
@@ -102,7 +106,7 @@ public enum RCode implements StatusCode {
     ACTIVITY_PLAN_MONTH_HAS(5000,"本月活动计划已上传，请删除后再次上传"),
     ACTIVITY_PLAN_FILENAME_LONG(5001,"文件名过长，请少于20个字"),
     ACTIVITY_PLAN_CELL_NOT_NULL(5002,"第%s行有空值，请改正后再次提交；"),
-    ACTIVITY_PLAN_TEM_ERROR(5003,"模板错误，请使用模板4.0；"),
+    ACTIVITY_PLAN_TEM_ERROR(5003,"模板错误，请使用模板5.0；"),
     ACTIVITY_PLAN_REPETITION_ERROR(5004,"活动计划列表中，有日期重复的计划；"),
     ACTIVITY_PLAN_NOT_SELF_DELETE(5005,"以前计划/非归属本人计划，不可删除；"),
     ACTIVITY_PLAN_NOT_DELETE(5005,"不可修改今日及以前活动；"),