From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
index bcdaa7e..2cbadab 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
@@ -23,9 +23,17 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/** 鍙��鎬荤Н鍒�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /** 鍙�� 鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
+ /** 鍙��绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal approveIntegralCash = BigDecimal.ZERO;
/**鍒嗛厤閲戦*/
private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
/**鍒嗛厤绉垎*/
private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal occupyRefundIntegralDeduction = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal occupyRefundIntegralCash = BigDecimal.ZERO;
}
--
Gitblit v1.8.0