From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/User.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/User.java b/src/main/java/com/mindskip/xzs/domain/User.java
index 549a0a2..1000226 100644
--- a/src/main/java/com/mindskip/xzs/domain/User.java
+++ b/src/main/java/com/mindskip/xzs/domain/User.java
@@ -65,7 +65,7 @@
private Date lastActiveTime;
/**
- * 鏄惁鍒犻櫎
+ * 鏄惁鍒犻櫎锛�0鏈垹闄� 1鍒犻櫎
*/
private Boolean deleted;
@@ -73,14 +73,14 @@
* 寰俊openId
*/
private String wxOpenId;
- private String deptIds;
/**
* 鏄惁閮ㄩ棬绠＄悊鍛�
*/
private String deptAdmin;
+ /**
+ * 鐘跺喌
+ */
private UserConditionEnum condition;
-
- private String conditionDetail;
}
--
Gitblit v1.8.0