From 75a26dc87580368036cb51155a2e2f8063a36dcc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 27 十一月 2023 19:02:55 +0800
Subject: [PATCH] Merge branch 'master-fwq点诊医生' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |    6 +++++-
 1 files changed, 5 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..0973a06 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,9 @@
     private Date startTime;
     /**缁撴潫鏃堕棿*/
     private Date endTime;
-    //鏄惁璇勪环
+    /**鏄惁璇勪环*/
     private Integer isEvaluate;
+    /**浼氬憳绫诲瀷*/
+    private Integer memberType;
 
 }

--
Gitblit v1.8.0