From 07e60bfa19de8bc7231b272872c5ba3fdf5fd82f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 03 一月 2024 16:11:24 +0800
Subject: [PATCH] Merge branch 'master-fwq组织架构优化' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index fa7b371..12eb2dc 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -23,6 +23,8 @@
     private String tel;
     /**鎵�灞為棬搴楁爣璇�*/
     private String shopId;
+    /**鍙傛暟*/
+    private String state;
     /**鎵�灞為【闂爣璇�*/
     private String hisCorpUserId;
     /**鎵�灞為【闂悕绉�*/
@@ -43,7 +45,14 @@
     private Date startTime;
     /**缁撴潫鏃堕棿*/
     private Date endTime;
-    //鏄惁璇勪环
+    /**鏄惁璇勪环*/
     private Integer isEvaluate;
+    /**浼氬憳绫诲瀷*/
+    private Integer memberType;
+    /**鏄惁鏌ヨtmk淇℃伅:0鍚�1鏄�*/
+    private Integer isTmk = 0;
+    /**鏄惁鏌ヨ骞撮緞:0鍚�1鏄�*/
+    private Integer isYear = 0;
+
 
 }

--
Gitblit v1.8.0