From 362db9d40ed24eca267187967824fe8b264ff095 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 13 十二月 2023 18:49:43 +0800
Subject: [PATCH] Merge branch 'rx-营销活动修改' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java | 11 +++++++++++
1 files changed, 11 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..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;
/**
@@ -10,8 +11,16 @@
* */
@Data
public class UserDoctorRoomDto {
+ /**鐐硅瘖绫诲瀷*/
+ private Integer type;
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
+ /**鐐硅瘖鏃堕棿寮�濮�*/
+ private Date startTime;
+ /**鐐硅瘖鏃堕棿缁撴潫*/
+ private Date endTime;
+ /**鐐硅瘖鍘熷洜绫诲瀷*/
+ private String reasonType;
/**澶囨敞*/
private String operatorRemark;
/**绉戝鍏崇郴Json*/
@@ -23,6 +32,8 @@
private String opShopId;
private String opShopName;
private String opRoleId;
+ private String opRoleName;
private String opRoleTypeId;
private String opRoleStr;
+
}
--
Gitblit v1.8.0