From 195af7b92b0aa5534cb28d25aa589f2d2545c7e9 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 25 九月 2023 17:17:38 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
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;
- /**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�*/
+ /**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�(鍏ㄩ儴)*/
private Integer usedNum;
+ /**鍗″寘-璇ュ崱椤规潯鐩凡浣跨敤娆℃暟锛堜笉鍖呮嫭閫�娆撅級*/
+ private Integer usedNumNoRefund;
+ /**鍗″寘-璇ュ崱椤规潯鐩凡閫�娆惧弬鏁�*/
+ private Integer usedNumRefund;
/**鍓╀綑鍙姷鎵ｆ�绘鏁�*/
private Integer surplusNum;
--
Gitblit v1.8.0