Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java

@@ -4,6 +4,7 @@ import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.vo.BUserAccountVO;
 import com.mmc.iuav.user.model.vo.TopInviteVO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
+import com.mmc.iuav.user.model.vo.UserStateVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -109,7 +110,9 @@ public class UserAccountDO implements Serializable {
         this.nickName = userAccountVO.getNickName();
         this.districtChildId = userAccountVO.getDistrictChildId();
         this.briefIntroduction = userAccountVO.getBriefIntroduction();
-        Integer userStateId = userAccountVO.getUserStateVO().getId();
+        UserStateVO userStateVO = userAccountVO.getUserStateVO();
+        if(userStateVO != null) {
+            userStateId = userStateVO.getId();
             if(userStateId == 0) {
                 this.userStateId = null;
             }else {
@@ -117,6 +120,8 @@ public class UserAccountDO implements Serializable {
             }
         }
 
+    }
+
     public UserAccountDO(BUserAccountVO bUserAccountVO) {
         this.id = bUserAccountVO.getId();
         this.phoneNum = bUserAccountVO.getPhoneNum();

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/cms
-  newTag: 6a1366e5d17ad9a85c000ebacbf838d6510a10ba
+  newTag: 65c6faaed739500063357a6082ddfbc3fbe3fc32