From 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb Mon Sep 17 00:00:00 2001
From: guang <guang@guang.com>
Date: 星期五, 14 六月 2024 16:43:48 +0800
Subject: [PATCH] Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform-feign into master-stander
---
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
index 2543ad8..9910c22 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
@@ -17,6 +17,8 @@
private String thirdPartyNo;
/***宸查��娆炬�婚噾棰�***/
private BigDecimal refundTotal = BigDecimal.ZERO;
+ /***宸查��娆炬�绘姷鎵ｉ噾棰�***/
+ private BigDecimal refundDeductionTotal = BigDecimal.ZERO;
/**********閫�娆剧被鍨�************/
/**閫�娆剧被鍨嬬被鍨�-寰俊*/
@@ -31,5 +33,7 @@
public static final int REFUND_TYPE_INCREMENT = 6;
/**閫�娆剧被鍨嬬被鍨�--his鐨勯��娆炬柟寮忥紙鎵�鏈夋柟寮忎唬琛級*/
public static final int REFUND_TYPE_HIS = 7;
+ /**閫�娆剧被鍨嬬被鍨�--鎶垫墸绉垎*/
+ public static final int REFUND_TYPE_INTEGRAL_CASH = 8;
}
--
Gitblit v1.8.0