From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 45f7035..27e25c4 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,7 +2,9 @@
 
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鐢ㄦ埛绉戝鍏崇郴杞崲浣跨敤
@@ -10,12 +12,32 @@
  * */
 @Data
 public class UserDoctorRoomDto {
+    /**鐐硅瘖绫诲瀷*/
+    private Integer type;
     /**鐢ㄦ埛鏍囪瘑*/
     private String userId;
+    /**闂ㄥ簵鏍囪瘑*/
+    private String shopId;
+    /**鐐硅瘖鏃堕棿寮�濮�*/
+    private Date startTime;
+    /**鐐硅瘖鏃堕棿缁撴潫*/
+    private Date endTime;
+    /**鐐硅瘖鍘熷洜绫诲瀷*/
+    private String reasonType;
     /**澶囨敞*/
     private String operatorRemark;
     /**绉戝鍏崇郴Json*/
     private List<UserDoctorRoomItemDto> roomList;
+    /**
+     * 绉戝鍏崇郴瀛樺偍绫诲瀷:
+     * 0鎸夋�荤殑鍏崇郴瀛樺偍鎴愪竴鏉$偣璇�
+     * 1鎸夊尰鐢熷垎寮�瀛樺偍鎴愪袱鏉$偣璇�
+     * 娉ㄥ皠绉慉鍖荤敓->鐐硅瘖B鍖荤敓 鐨偆绉慉鍖荤敓->鐐硅瘖C鍖荤敓  瀛樺偍涓�鏉�
+     * 娉ㄥ皠绉慉鍖荤敓->鐐硅瘖B鍖荤敓 鐨偆绉態鍖荤敓->鐐硅瘖C鍖荤敓  瀛樺偍涓ゆ潯
+     * */
+    private Integer roomType = 0 ;
+    /**鍖荤敓鏍囪瘑,鍏宠仈鏍囪瘑*/
+    private Map<String,String> roomTypeMap;
 
     /**鎿嶄綔浜轰俊鎭�*/
     private String opId;
@@ -23,6 +45,8 @@
     private String opShopId;
     private String opShopName;
     private String opRoleId;
+    private String opRoleName;
     private String opRoleTypeId;
     private String opRoleStr;
+
 }

--
Gitblit v1.8.0