From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
index 5a96e24..28eb8ed 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
@@ -47,14 +47,28 @@
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;
+
/**绯荤粺璁＄畻璧嬪��-閫�娆鹃噾棰�*/
private BigDecimal refundTotal = BigDecimal.ZERO;
/**绯荤粺璁＄畻璧嬪��-閫�娆剧Н鍒�*/
private BigDecimal refundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆炬姷鎵ｇ殑鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal refundIntegralDeduction = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆剧Н鍒嗘姷鎵ｇ殑鐜伴噾*/
+ private BigDecimal refundIntegralCash = BigDecimal.ZERO;
/**鎿嶄綔绫诲瀷-绯荤粺*/
public static final String OP_TYPE_SYSTEM = "system";
--
Gitblit v1.8.0