Merge remote-tracking branch 'origin/master'

xiejun

2023-10-19 8b73e9cbdf4035ef1aa1026c979222a7e4ca5e01

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

@@ -54,7 +54,8 @@
      userVO.setSexName(DictCache.getValue(DictEnum.SEX, user.getSex()));
      userVO.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
      userVO.setUserStatus(user.getUserStatus());
      userVO.setUserStatus_text(DictCache.getValue(DictEnum.USER_STATUS,user.getUserStatus()));//用户状态
      userVO.setUserStatusText(DictCache.getValue(DictEnum.USER_STATUS,user.getUserStatus()));//用户状态
      return userVO;
   }

}