From 15a504033f949ba6e8b9cf712a8a70052bc7d6a8 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期日, 25 六月 2023 10:20:23 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |    9 +++++++--
 1 files changed, 7 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 325f280..3768939 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
@@ -5,6 +5,8 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.util.Date;
+
 
 /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
 @Data
@@ -37,6 +39,9 @@
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/
     private Integer isHaveCorp;
-    /*寮�鍗曞钩鍙帮紝鏉ユ簮搴旂敤appId*/
-    private String appId;
+
+    private Date startTime;
+
+    private Date endTime;
+
 }

--
Gitblit v1.8.0