From 3b2d2bbcc05c0af257dfd06260fb0e91169822b2 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 27 八月 2024 15:48:00 +0800
Subject: [PATCH] Merge branch 'fhx-base-预约整合0808' into master-xlk-test
---
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
index fe2b495..5e727e2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
@@ -73,6 +73,8 @@
private String remark;
/** 椁愰澶囨敞 */
private String mealsRemark;
+ /** 棰勭害鍐茬獊鍘熷洜 */
+ private String conflictReason;
/** 棰勭害椤圭洰json瀛楃涓� */
private String projectJson;
--
Gitblit v1.8.0