Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

 Conflicts:
	csm-service/cms-service-user/src/main/resources/application-local.yml

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/wallet/PayWalletController.java

@@ -41,7 +41,7 @@ public class PayWalletController extends BaseController {
     @GetMapping("getPayWalletInfo")
     public ResultBody<PayWalletDTO> getPayWalletInfo(
             @ApiParam(value = "用户userAccountId", required = true) @RequestParam Integer userAccountId) {
-        return ResultBody.success(payWalletService.getPayWalletInfo(userAccountId));
+        return payWalletService.getPayWalletInfo(userAccountId);
     }
 
     @ApiOperation(value = "feign-云享金充值增加金额")

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

@@ -161,6 +161,10 @@ public class UserAccountServiceImpl implements UserAccountService {
             List<CooperationTagVO> cooperationTags = cooperationTagDOS.stream().map(CooperationTagDO::buildCooperationTagVO).collect(Collectors.toList());
             userAccountSimpleDTO.setCooperationTagVOS(cooperationTags);
         }
+        ResultBody<RealNameAuthDTO> userDetail = realNameAuthService.userDetail(userAccountId);
+        if (userDetail.getCode().equals(ResultEnum.SUCCESS.getResultCode()) && userDetail.getResult() != null) {
+            userAccountSimpleDTO.setUserName(userDetail.getResult().getUserName());
+        }
         return userAccountSimpleDTO;
     }
 

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: 73c61e5bcdf2fdbdcb979d195828e7730068789c
+  newTag: e9a1457def54bcc022a94c3dce8db0d821534e26