From fa302a7e0a5960a0f7e9fc763a1f56fbed481c4e Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 20 十一月 2023 18:40:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java | 9 ++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
index 8c8bd0c..836ce0b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
@@ -8,10 +8,13 @@
*/
@Data
public class MarketingResultDto {
- /**钀ラ攢鍔╂墜椤圭洰鐨勬爣璇�*/
+ /**钀ラ攢鍔╂墜鍞竴鏍囪瘑*/
private String applyId;
- /**瀹℃牳鏍囪瘑*/
- private String examineId;
+ /**鍞竴鏍囪瘑*/
+ private String uniqueId;
/**鏄惁鐩存帴閫氳繃:0鍚�1鏄�,濡傛灉鏄洿鎺ラ�氳繃鍒欎笉鍐嶅洖璋僊arketingReturnDto*/
private Integer isPass;
+ /**瀹℃牳鏍囪瘑*/
+ private String examineId;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
index 0f5443e..a15203e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
@@ -2,6 +2,7 @@
import lombok.Data;
+import java.util.Date;
import java.util.List;
/**
@@ -14,6 +15,12 @@
private Integer type;
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
+ /**鐐硅瘖鏃堕棿寮�濮�*/
+ private Date startTime;
+ /**鐐硅瘖鏃堕棿缁撴潫*/
+ private Date endTime;
+ /**鐐硅瘖鍘熷洜绫诲瀷*/
+ private String reasonType;
/**澶囨敞*/
private String operatorRemark;
/**绉戝鍏崇郴Json*/
--
Gitblit v1.8.0