From e4538a591ef58e33984e9e8209833d1243719e2e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 02 八月 2023 11:57:04 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-热门活动

---
 phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
index 7f60784..683645f 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
@@ -21,8 +21,12 @@
     private Integer deductionNum;
     /**鐢ㄦ埛鍗¢」鏉$洰-鍗曟鎶垫墸娆℃暟*/
     private Integer deductionSingle;
-    /**鐢ㄦ埛鍗¢」鏉$洰-宸叉姷鎵f鏁�*/
+    /**鐢ㄦ埛鍗¢」鏉$洰-宸叉姷鎵f鏁�(鍏ㄩ儴)*/
     private Integer usedNum;
+    /**鍗″寘-璇ュ崱椤规潯鐩凡浣跨敤娆℃暟锛堜笉鍖呮嫭閫�娆撅級*/
+    private Integer usedNumNoRefund;
+    /**鍗″寘-璇ュ崱椤规潯鐩凡閫�娆惧弬鏁�*/
+    private Integer usedNumRefund;
     /**鍓╀綑鍙姷鎵f�绘鏁�*/
     private Integer surplusNum;
 

--
Gitblit v1.8.0