From c0ad40fda3f99662380409c426eaecf16153096c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 09 四月 2024 11:06:41 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
index db2ccce..ed46ddd 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -33,5 +33,12 @@
 
     /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
     private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+    /** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+    /**鍒嗛厤鍙��閲戦*/
+    private List<OrderPayMethodDto> refundPayMethodList;
+
+    /** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
+    private BigDecimal averageIntegral = BigDecimal.ZERO;
 
 }

--
Gitblit v1.8.0