From 421ee711aa469f00eaff610cfa85ad1d4b755688 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 08:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java
index 6eb8f0d..5e2b2b1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/vo/UserVO.java
@@ -86,12 +86,14 @@
 	 * 鎷撳睍淇℃伅
 	 */
 	private String userExt;
+
 	/***
 	 * 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄惎鐢�
 	 */
 	private Integer userStatus;
+
 	/***
 	 * 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄惎鐢�
 	 */
-	private String userStatus_text;
+	private String userStatusText;
 }

--
Gitblit v1.9.3