Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 202f9c361a080016ec6a56316007610c7191d3b3
+  newTag: 026dd0d1a0b5ed80ec04539c5481ddafb7884265

release-service/src/main/java/com/mmc/csf/release/service/impl/BackRequirementsServiceImpl.java

@@ -10,10 +10,14 @@ import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.dao.BackRequirementsDao;
 import com.mmc.csf.release.dao.OrderAmountDetailDao;
 import com.mmc.csf.release.dao.RequirementsDao;
-import com.mmc.csf.release.entity.requirements.*;
+import com.mmc.csf.release.entity.requirements.OrderAmountDetailDO;
+import com.mmc.csf.release.entity.requirements.RequirementsAmountUpdateDO;
+import com.mmc.csf.release.entity.requirements.ServiceOrderFormDO;
+import com.mmc.csf.release.entity.requirements.ServiceOrderFormDetailsDO;
 import com.mmc.csf.release.enums.ServiceIdEnum;
 import com.mmc.csf.release.feign.UserAppApi;
 import com.mmc.csf.release.service.BackRequirementsService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +34,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
+@Slf4j
 public class BackRequirementsServiceImpl implements BackRequirementsService {
 
     @Autowired
@@ -60,6 +65,7 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
         if (count == 0) {
             return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
         }
+        log.info("{} 团队成员id === 》 {}",userAccountId, pilotUserIdList);
         Integer pageNo = param.getPageNo();
         param.buildCurrentPage();
         List<ServiceOrderFormDO> serviceOrderFormDOS = backRequirementsDao.serviceOrderFormList(param);