合并分支 'dxy' 到 'qa'

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,"试吃必备物料照片未上传"),
 
 
     /**