From 47dc1bef06f17e498b573b6098d56739607e44d1 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 17 十月 2023 12:03:17 +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 |    9 ++++++++-
 1 files changed, 8 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 fe96185..6eb8f0d 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,5 +86,12 @@
 	 * 鎷撳睍淇℃伅
 	 */
 	private String userExt;
-
+	/***
+	 * 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄惎鐢�
+	 */
+	private Integer userStatus;
+	/***
+	 * 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄惎鐢�
+	 */
+	private String userStatus_text;
 }

--
Gitblit v1.9.3