From 1cc8d819402db6729edcd2cf0349ae8ab1a84ce0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 12 八月 2024 16:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fhx-base-预约整合0808' into master-xlk

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index b17c67c..3a33e74 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -69,5 +69,9 @@
     private String giveIncreaseTitle;
     /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
     private String giveIncreaseInfo;
+    /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
+    private List<String> canIntegralCashIdList;
+    /**闈炲繀濉� 鍏朵粬鎴浘鎴栬�呮枃浠朵笂浼� **/
+    private List<OrderOtherFilesDto> otherInfoFiles;
 
 }

--
Gitblit v1.8.0