Merge branch 'master' into develop

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

@@ -140,7 +140,7 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         }
         // 不能修改自己的角色
         if (loginSuccessDTO.getUserAccountId().toString().equals(bUserAccountVO.getId().toString())
-                && !bUserAccountVO.getRoleId().toString().equals(roleInfoDO.getId())) {
+                && !(bUserAccountVO.getRoleId().equals(roleInfoDO.getId()))) {
             return ResultBody.error(ResultEnum.UPDATE_OWNER_ROLE_ERROR);
         }
         // 不能修改admin账号的角色

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: 8094110e642e8da7e440efb4422f8dc3fbc73332
+  newTag: 9c8dd1a3304d734ce5be3be304a8cfe9e34bd77d