From 67926388d2b3b96f6360af6d70fdc56596b6b39d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 28 四月 2024 16:31:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金
---
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
index 053da40..7bf4128 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
@@ -19,6 +19,8 @@
private String payMethodName;
/** 鍙��鏀粯閲戦 */
private BigDecimal payTotal;
+ /** 鍙��鏀粯閲戦 -鎶垫墸閲戦*/
+ private BigDecimal payDeductionTotal;
/**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
private Integer isMoneyPay;
/**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
@@ -32,6 +34,8 @@
private String refundMethodName;
/** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal refundTotal;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰�-鎶垫墸閲戦锛�*/
+ private BigDecimal refundDeductionTotal;
/**杞崲鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
private Integer isMoneyPayRefund;
/**杞崲鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
--
Gitblit v1.8.0