合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityCoreController.java

@@ -146,13 +146,13 @@ public class TemporaryActivityCoreController {
                 throw new DataException(RCode.NOT_TGHD_PHOTO_ERROR);
             }else if (CollectionUtils.isEmpty(activityReportedDto.getTgcjPhotoInfos()) ){
                 throw new DataException(RCode.NOT_TGCJ_PHOTO_ERROR);
-            }else if (CollectionUtils.isEmpty(activityReportedDto.getScpPhotoUrls()) ){
+            }else if (CollectionUtils.isEmpty(activityReportedDto.getScpPhotoInfos()) ){
                 throw new DataException(RCode.NOT_SCP_PHOTO_ERROR);
-            } else if (CollectionUtils.isEmpty(activityReportedDto.getPfzpPhotoUrls()) ){
+            } else if (CollectionUtils.isEmpty(activityReportedDto.getPfzpPhotoInfos()) ){
                 throw new DataException(RCode.NOT_PFZP_PHOTO_ERROR);
-            } else if (CollectionUtils.isEmpty(activityReportedDto.getGfqPhotoUrls()) ){
+            } else if (CollectionUtils.isEmpty(activityReportedDto.getGfqPhotoInfos()) ){
                 throw new DataException(RCode.NOT_GFQ_PHOTO_ERROR);
-            } else if (CollectionUtils.isEmpty(activityReportedDto.getScbbwlPhotoUrls()) ){
+            } else if (CollectionUtils.isEmpty(activityReportedDto.getScbbwlPhotoInfos()) ){
                 throw new DataException(RCode.NOT_SCBBWL_PHOTO_ERROR);
             }
             tempActivityCoreService.activityReportedSubmit(id);

src/main/java/com/wangxiaolu/promotion/enums/activity/ActivityPhotoType.java

@@ -39,24 +39,28 @@ public enum ActivityPhotoType {
      * 下班打卡图片
      */
     CLOCK_OUT(7),
+    /**
+     * 试吃照片
+     */
+    TASTY_PHOTO(8),
     /**
      * 当日销量POS机页面凭证
      */
-    POS_SELL_VOUCHER(8),
+    POS_SELL_VOUCHER(9),
 
     /**
-     * 试吃照片
+     * 高峰期在岗
+     * 更改固定任务：下午18点15任务
      */
-    TASTY_PHOTO(9),
+    RANDOM_TASK(10),
     /**
      * 配发赠品照片
      */
-    SEND_GIFT_PHOTO(10),
+    SEND_GIFT_PHOTO(11),
+
     /**
-     * 高峰期在岗
-     * 更改固定任务：下午18点15任务
+     * 试吃素材
      */
-    RANDOM_TASK(11),
     TASTY_MATERIALS(12)
     ;