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/entity/User.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
index 7c5ecc7..1dcba8b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
@@ -89,6 +89,11 @@
 	 */
 	private String deptId;
 	/**
+	 * 閮ㄩ棬鍚嶇О
+	 */
+	@TableField(exist = false)
+	private String deptName;
+	/**
 	 * 瀵嗙爜绛栫暐
 	 */
 	@TableField(exist = false)
@@ -104,10 +109,14 @@
 	/**
 	 * 鐢ㄦ埛瀵嗙骇
 	 */
-	private String secretgrade;
+	private String secretGrade;
 	/**
 	 * 瀵嗙爜绛栫暐淇敼鐘舵��
 	 */
 	private Long strategyUpdateStatus;
 
+	/**
+	 * 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄仠鐢�
+	 */
+	private Integer userStatus;
 }

--
Gitblit v1.9.3