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

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

diff --git a/src/main/java/com/mindskip/xzs/domain/User.java b/src/main/java/com/mindskip/xzs/domain/User.java
index 6f3c34d..1000226 100644
--- a/src/main/java/com/mindskip/xzs/domain/User.java
+++ b/src/main/java/com/mindskip/xzs/domain/User.java
@@ -73,7 +73,6 @@
      * 寰俊openId
      */
     private String wxOpenId;
-    private String deptIds;
 
     /**
      * 鏄惁閮ㄩ棬绠$悊鍛�
@@ -84,9 +83,4 @@
      * 鐘跺喌
      */
     private UserConditionEnum condition;
-
-    /**
-     * 鍏蜂綋鎯呭喌
-     */
-    private String conditionDetail;
 }

--
Gitblit v1.8.0