From f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 16:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/domain/User.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/domain/User.java b/src/main/java/com/mindskip/xzs/domain/User.java
index 70f075f..6f3c34d 100644
--- a/src/main/java/com/mindskip/xzs/domain/User.java
+++ b/src/main/java/com/mindskip/xzs/domain/User.java
@@ -80,7 +80,13 @@
      */
     private String deptAdmin;
 
+    /**
+     * 鐘跺喌
+     */
     private UserConditionEnum condition;
 
+    /**
+     * 鍏蜂綋鎯呭喌
+     */
     private String conditionDetail;
 }

--
Gitblit v1.8.0