From e023b237419249348ca4936a374197166779f066 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 14 八月 2023 16:34:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
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