From 860c4e691821197e05e12cc6288a36f89c410181 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期日, 07 四月 2024 15:48:48 +0800
Subject: [PATCH] Merge branch 'fhx-prod-CRM预约' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
index 6b810b2..25fea90 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
@@ -47,12 +47,16 @@
     /** 缁撴潫鏃堕棿 */
     private String endTime;
 
-    /** 鏁烽夯鏃堕暱(绉�) */
+    /** 娌熼�氭椂闀�(鍒�) */
+    private Integer comDuration;
+    /** 鏁烽夯鏃堕暱(鍒�) */
     private Integer palsyDuration;
-    /** 绛夊緟鏃堕暱(绉�) */
+    /** 绛夊緟鏃堕暱(鍒�) */
     private Integer waitDuration;
-    /** 瀹為檯闈㈣瘖鏃堕暱(绉�) */
+    /** 瀹為檯闈㈣瘖鏃堕暱(鍒�) */
     private Integer realMzTime;
 
+    /** 鏄惁褰撳ぉ鍒嗛殧涓婁笅鍗堝尮閰�(榛樿false) */
+    private boolean isDaySpace = false;
 
 }

--
Gitblit v1.8.0