Merge branch 'master' into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java

@@ -28,6 +28,7 @@ import com.mmc.iuav.user.model.dto.dronepilot.*;
 import com.mmc.iuav.user.model.qo.dronepilot.*;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import com.mmc.iuav.user.model.vo.PilotAuditSumVO;
+import com.mmc.iuav.user.model.vo.UserStateVO;
 import com.mmc.iuav.user.model.vo.WxMsgVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
@@ -179,7 +180,8 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
             }
             Integer userStateId = userServiceDao.getUserStateId(pilotCertificationDTO.getUserAccountId());
             if(userStateId != null) {
-                pilotCertificationDTO.setUserStateVO(userServiceDao.getUserState(userStateId));
+                UserStateVO userState = userServiceDao.getUserState(userStateId);
+                pilotCertificationDTO.setUserStateVO(userState);
             }
             return  pilotCertificationDTO;
         })

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: 08ecde15f0b7aa3b0be39b8088bb81c1555e5372
+  newTag: 846f745c618029d8e6ab6a3ab0be389d79599b71