From c1107fe385312f9a7b1d9d84c06aaf54e01440fa Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期二, 14 五月 2024 15:27:12 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander

---
 crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
index 63b7fe3..561dc8f 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
@@ -30,6 +30,9 @@
     /** 閫�娆惧娉� */
     private String remarks;
 
+    /**宸查��鏂瑰紡鐨勯噾棰濓紝涓嶄細鍦–RM鍐嶆墽琛岄��娆撅紝鍙绠楅��娆鹃噾棰濈殑鏁版嵁*/
+    private List<RefundModelVo> refundModelList;
+
     /**蹇呭~ 閫�娆剧涓夋柟鏀粯鎬婚噾棰濓紙寰俊/鏀粯瀹濇敮浠�/鍏朵粬锛夛紙鍏冿級 */
     private BigDecimal refundAmountTotal;
     /**蹇呭~ 閫�娆惧偍鍊奸噾鎬婚噾棰濓紙鍏冿級 */
@@ -38,6 +41,8 @@
     private BigDecimal refundIncrement;
     /**蹇呭~ 閫�娆炬�荤Н鍒� */
     private BigDecimal refundIntegral;
+    /**蹇呭~ 閫�娆炬�绘姷鎵gН鍒� */
+    private BigDecimal refundIntegralDeduction;
 
     ////鎿嶄綔浜轰俊鎭�
     /**蹇呭~ 鎿嶄綔浜虹被鍨� */

--
Gitblit v1.8.0