From d07e5cacbf0f3c1e1b5b42e115e1de574de55aea Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 12 七月 2023 10:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..7f60784 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,13 +13,13 @@
private String itemId;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍚嶇О*/
private String itemName;
- /**鐢ㄦ埛鍗￠」鏉＄洰-鎬婚噾棰�*/
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍒嗘憡鎬婚噾棰�*/
private BigDecimal total;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸閲戦*/
private BigDecimal singleAmount;
/**鐢ㄦ埛鍗￠」鏉＄洰-鎬绘姷鎵ｆ鏁�*/
private Integer deductionNum;
- /**鐢ㄦ埛鍗￠」鏉＄洰-姣忔鎶垫墸娆℃暟*/
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸娆℃暟*/
private Integer deductionSingle;
/**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�*/
private Integer usedNum;
--
Gitblit v1.8.0