From eeb29e79eb51059f81dc9c2b862e25e81ae8767b Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期日, 07 四月 2024 17:40:16 +0800
Subject: [PATCH] Merge branch 'fhx-prod-CRM预约' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java | 10 +++++++++-
1 files changed, 9 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..f05f4ac 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
@@ -13,6 +13,10 @@
private String itemId;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍚嶇О*/
private String itemName;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-绫诲瀷*/
+ private String itemType;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-缂栧彿*/
+ private String itemCode;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍒嗘憡鎬婚噾棰�*/
private BigDecimal total;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸閲戦*/
@@ -21,8 +25,12 @@
private Integer deductionNum;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸娆℃暟*/
private Integer deductionSingle;
- /**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�*/
+ /**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�(鍏ㄩ儴)*/
private Integer usedNum;
+ /**鍗″寘-璇ュ崱椤规潯鐩凡浣跨敤娆℃暟锛堜笉鍖呮嫭閫�娆撅級*/
+ private Integer usedNumNoRefund;
+ /**鍗″寘-璇ュ崱椤规潯鐩凡閫�娆惧弬鏁�*/
+ private Integer usedNumRefund;
/**鍓╀綑鍙姷鎵ｆ�绘鏁�*/
private Integer surplusNum;
--
Gitblit v1.8.0