Merge remote-tracking branch 'origin/master'

ludc

2024-02-24 344ada5bc3e41c5fb42ae0e8ac590b64b7cb04ca

 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java

@@ -53,6 +53,8 @@
      userVO.setPostName(Func.join(postName));
      userVO.setSexName(DictCache.getValue(DictEnum.SEX, user.getSex()));
      userVO.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
      userVO.setUserStatus(user.getUserStatus());
      userVO.setUserStatusText(DictCache.getValue(DictEnum.USER_STATUS,user.getUserStatus()));//用户状态
      return userVO;
   }