From bceee99e4493c359e2c0872e4076d3db95718b71 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 09 五月 2024 18:08:57 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java |    2 ++
 1 files changed, 2 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 884f443..7de0409 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
@@ -15,6 +15,8 @@
     private Integer type;
     /**鐢ㄦ埛鏍囪瘑*/
     private String userId;
+    /**闂ㄥ簵鏍囪瘑*/
+    private String shopId;
     /**鐐硅瘖鏃堕棿寮�濮�*/
     private Date startTime;
     /**鐐硅瘖鏃堕棿缁撴潫*/

--
Gitblit v1.8.0