Merge branch 'develop'

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

@@ -271,6 +271,9 @@ public class UserAccountServiceImpl implements UserAccountService {
             if(user.getNickName() != null){
                 userAccount.setNickName(user.getNickName());
             }
+            if(user.getUserImg() != null){
+                userAccount.setUserImg(user.getUserImg());
+            }
         }
         userAccount.setId(id);
         userAccount.setPhoneNum(userPhoneNumber);

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: c1ab801ba27ac7466610fe3b5d54efea2e84fec8
+  newTag: aae95bd32e16557b82a87a2ca3802377f950e099