From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 八月 2024 16:20:08 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
index cca17dc..c4a3f06 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author wzh
@@ -33,10 +34,15 @@
     private String refundNumberName;
     /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
     private BigDecimal money;
+    /** 杞崲瀹為��鎶垫墸鍊� 锛堝疄闄呴��娆剧Н鍒嗭級*/
+    private BigDecimal deductionTotal;
 
     /** 澶囨敞 */
     private String remarks;
 
+    /** 鍏朵粬閫�娆炬柟寮� */
+    private List<OrderPayMethodDto> otherRefundMethodList;
+
 
     public OrderPayMethodDto() {
     }

--
Gitblit v1.8.0