From 827d118f2923861f2aa8871b722f8d104c637a6e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 14 八月 2023 15:55:34 +0800
Subject: [PATCH] Merge branch 'master-prod-new' 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 1e89f21..e05dee0 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
@@ -40,6 +40,8 @@
     //////绯荤粺鍙傛暟
     /** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */
     private BigDecimal totalAmount;
+    /** 鍙��娆炬�荤Н鍒嗭紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */
+    private BigDecimal totalIntegral;
     /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
     private BigDecimal refundTotal;
     /** 鍙��娆炬柟寮忛泦鍚� */

--
Gitblit v1.8.0