From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 64e4d71..fa7b371 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
@@ -39,9 +39,11 @@
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/
     private Integer isHaveCorp;
-
+    /**寮�濮嬫椂闂�*/
     private Date startTime;
-
+    /**缁撴潫鏃堕棿*/
     private Date endTime;
+    //鏄惁璇勪环
+    private Integer isEvaluate;
 
 }

--
Gitblit v1.8.0