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/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