From a458dab7990cf8f9d9f834a19db4f2d8b549b467 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 23 四月 2024 14:25:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金 --- phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java index ecdba91..982b63a 100644 --- a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java +++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java @@ -18,6 +18,19 @@ private String cardName; /**鍗¢」-鎬婚噾棰�*/ private BigDecimal total; + + /**鍗″寘-鐘舵��*/ + private Integer effectiveStatus; + + /**鍗″寘鎵�灞炵敤鎴�-鏍囪瘑*/ + private String userId; + /**鍗″寘鎵�灞炵敤鎴�-鍚嶇О*/ + private String userName; + /**鍗″寘鎵�灞炵敤鎴�-CIQ*/ + private String userCiq; + /**鍗″寘鎵�灞炵敤鎴�-鐢ㄦ埛鎵�灞為棬搴�*/ + private String userShopId; + /**鍏宠仈鐨勬潈鐩�*/ private List<UserCardEquityVo> userCardEquityVoList; -- Gitblit v1.8.0