From ab2a6f7e77b504a82de22dc2b8dd987564ed77f5 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 26 九月 2023 17:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
index 8d3062e..2a1b367 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
@@ -3,6 +3,8 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @ClassName DoctorTimeDto
  * @Description 鍖荤敓鎺掔彮dto
@@ -16,4 +18,15 @@
     String monthStr;
     String shopId;
     String doctorId;
+    String dayTime;
+    Date startTime;
+    Date endTime;
+    Integer intervalTime;
+
+    private String remark;
+    private Integer timeType;
+    private Integer isSpec;
+    private String opEmpName;
+    private String opEmpId;
+
 }

--
Gitblit v1.8.0