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/OrderItemRefundDto.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
index 8c63637..a8c19b5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -36,5 +36,10 @@
 
     /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
     private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+    /** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+
+    /** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
+    private BigDecimal averageIntegral = BigDecimal.ZERO;
 
 }

--
Gitblit v1.8.0