From e7d554f4f8f79eafaa2de3abe036d21e300fd14a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 17:39:56 +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/room/UserDoctorRoomDto.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
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 0ec1c33..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*/
@@ -25,6 +32,7 @@
private String opShopId;
private String opShopName;
private String opRoleId;
+ private String opRoleName;
private String opRoleTypeId;
private String opRoleStr;
--
Gitblit v1.8.0