From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 b3d024e..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,16 +13,24 @@
     private String itemId;
     /**鐢ㄦ埛鍗¢」鏉$洰-鍚嶇О*/
     private String itemName;
-    /**鐢ㄦ埛鍗¢」鏉$洰-鎬婚噾棰�*/
+    /**鐢ㄦ埛鍗¢」鏉$洰-绫诲瀷*/
+    private String itemType;
+    /**鐢ㄦ埛鍗¢」鏉$洰-缂栧彿*/
+    private String itemCode;
+    /**鐢ㄦ埛鍗¢」鏉$洰-鍒嗘憡鎬婚噾棰�*/
     private BigDecimal total;
     /**鐢ㄦ埛鍗¢」鏉$洰-鍗曟鎶垫墸閲戦*/
     private BigDecimal singleAmount;
     /**鐢ㄦ埛鍗¢」鏉$洰-鎬绘姷鎵f鏁�*/
     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