From a7a946b8720345bc25c6626a7e5a2298cc16d67e Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 31 一月 2024 11:34:48 +0800 Subject: [PATCH] Merge branch 'master-fwq优惠券增加平台限制信息' 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; - /**鐢ㄦ埛鍗¢」鏉$洰-宸叉姷鎵f鏁�*/ + /**鐢ㄦ埛鍗¢」鏉$洰-宸叉姷鎵f鏁�(鍏ㄩ儴)*/ private Integer usedNum; + /**鍗″寘-璇ュ崱椤规潯鐩凡浣跨敤娆℃暟锛堜笉鍖呮嫭閫�娆撅級*/ + private Integer usedNumNoRefund; + /**鍗″寘-璇ュ崱椤规潯鐩凡閫�娆惧弬鏁�*/ + private Integer usedNumRefund; /**鍓╀綑鍙姷鎵f�绘鏁�*/ private Integer surplusNum; -- Gitblit v1.8.0