From 2a72c5fc5cc09fe98abe21e9cedd01142b0f17c7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 22 十一月 2023 15:30:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index d956e15..8297196 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -46,6 +46,8 @@
     private BigDecimal totalIntegral;
     /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
     private BigDecimal refundTotal;
+    /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
+    private BigDecimal refundIntegral;
     /** 鍙��娆炬柟寮忛泦鍚� */
     private List<OrderPayMethodDto> payMethodList;
     /** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */

--
Gitblit v1.8.0