合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/controller/user/tem/TemporaryInfoCoreController.java

@@ -80,7 +80,6 @@ public class TemporaryInfoCoreController {
         BeanUtils.copyProperties(wxTemporaryEnrollVo, delayEntity);
         // 设置数据日期（当天）、创建时间、未处理状态
         delayEntity.setCreateTime(LocalDateTime.now());
-        delayEntity.setCreateTime(LocalDateTime.now());
         delayEntity.setIsProcessed(0);
 
         // 保存到延迟表

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

@@ -291,7 +291,7 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
             tempActivityPhotoDao.saveReportedList(null,temporaryId, reportedId, ActivityPhotoType.TASTY_PHOTO.getType(), temActDto.getScpPhotoUrls());
         }
         // 配发赠品照片
-        if (CollectionUtils.isEmpty(temActDto.getGfqPhotoUrls())) {
+        if (CollectionUtils.isEmpty(temActDto.getPfzpPhotoUrls())) {
             tempActivityPhotoDao.deleteList(reportedId, ActivityPhotoType.SEND_GIFT_PHOTO.getType());
         } else {
             tempActivityPhotoDao.saveReportedList(null,temporaryId, reportedId, ActivityPhotoType.SEND_GIFT_PHOTO.getType(), temActDto.getPfzpPhotoUrls());