From ab2a6f7e77b504a82de22dc2b8dd987564ed77f5 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 26 九月 2023 17:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 14bac4b..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
@@ -23,11 +23,13 @@
private Integer effectiveStatus;
/**鍗″寘鎵�灞炵敤鎴�-鏍囪瘑*/
- private String userUserId;
+ private String userId;
/**鍗″寘鎵�灞炵敤鎴�-鍚嶇О*/
private String userName;
/**鍗″寘鎵�灞炵敤鎴�-CIQ*/
private String userCiq;
+ /**鍗″寘鎵�灞炵敤鎴�-鐢ㄦ埛鎵�灞為棬搴�*/
+ private String userShopId;
/**鍏宠仈鐨勬潈鐩�*/
private List<UserCardEquityVo> userCardEquityVoList;
--
Gitblit v1.8.0