From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
index c079fca..4d85381 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
@@ -24,10 +24,20 @@
     private BigDecimal approveRefundTotal = BigDecimal.ZERO;
     /** 鍙��鎬荤Н鍒�*/
     private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+    /** 鍙��鎬绘姷鎵g幇閲戠殑绉垎*/
+    private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
+    /** 鍙��鎬荤Н鍒嗘姷鎵g殑鐜伴噾*/
+    private BigDecimal approveIntegralCash = BigDecimal.ZERO;
+
+
     /**鍒嗛厤閲戦*/
     private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
     /**鍒嗛厤绉垎*/
     private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
 
+    /**鍒嗛厤鎶垫墸鐜伴噾鐨勭Н鍒�*/
+    private BigDecimal occupyIntegralDeduction = BigDecimal.ZERO;
+    /**鍒嗛厤绉垎鎶垫墸鐨勯噾棰�*/
+    private BigDecimal occupyIntegralCash = BigDecimal.ZERO;
 
 }

--
Gitblit v1.8.0