合并分支 'dxy' 到 'qa'

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

@@ -161,22 +161,26 @@ public class TemporaryActivityReportedDto {
      */
     private List<String> scpPhotoUrls;
     private List<TemporaryActivityPhotoDto>scpPhotoInfos;
+    private List<String> scpChangePhotoUrls;
     /**
      * 配发赠品照片
      */
     private List<String> pfzpPhotoUrls;
     private List<TemporaryActivityPhotoDto>pfzpPhotoInfos;
+    private List<String> pfzpChangePhotoUrls;
     /**
      * 高峰期在岗
      */
     private List<String> gfqPhotoUrls;
     private List<TemporaryActivityPhotoDto> gfqPhotoInfos;
+    private List<String> gfqChangePhotoUrls;
 
     /**
      * 试吃必备物料照片
      */
     private List<String> scbbwlPhotoUrls;
     private List<TemporaryActivityPhotoDto> scbbwlPhotoInfos;
+    private List<String> scbbwlChangePhotoUrls;
 
     /**
      * 创建时间

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityQueryServiceImpl.java

@@ -125,7 +125,11 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
             dto.setTgscPhotoUrls(reportedGroup.get(ActivityPhotoType.TGSC.getType()));
             dto.setTghdPhotoUrls(reportedGroup.get(ActivityPhotoType.TGHD.getType()));
             dto.setTgcjPhotoUrls(reportedGroup.get(ActivityPhotoType.TGCJ.getType()));
+            dto.setScpPhotoUrls(reportedGroup.get(ActivityPhotoType.TASTY_PHOTO.getType()));
             dto.setPsvPhotoUrls(reportedGroup.get(ActivityPhotoType.POS_SELL_VOUCHER.getType()));
+            dto.setPfzpPhotoUrls(reportedGroup.get(ActivityPhotoType.SEND_GIFT_PHOTO.getType()));
+            dto.setGfqPhotoUrls(reportedGroup.get(ActivityPhotoType.RANDOM_TASK.getType()));
+            dto.setScbbwlPhotoUrls(reportedGroup.get(ActivityPhotoType.TASTY_MATERIALS.getType()));
         }
     }
 
@@ -138,7 +142,6 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
             dto.setTgscPhotoInfos(reportedGroup.get(ActivityPhotoType.TGSC.getType()));
             dto.setTghdPhotoInfos(reportedGroup.get(ActivityPhotoType.TGHD.getType()));
             dto.setTgcjPhotoInfos(reportedGroup.get(ActivityPhotoType.TGCJ.getType()));
-            dto.setPsvPhotoInfos(reportedGroup.get(ActivityPhotoType.POS_SELL_VOUCHER.getType()));
             dto.setScpPhotoInfos(reportedGroup.get(ActivityPhotoType.TASTY_PHOTO.getType()));
             dto.setPsvPhotoInfos(reportedGroup.get(ActivityPhotoType.POS_SELL_VOUCHER.getType()));
             dto.setPfzpPhotoInfos(reportedGroup.get(ActivityPhotoType.SEND_GIFT_PHOTO.getType()));