From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java |    4 ++++
 1 files changed, 4 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 e822e5e..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
@@ -22,10 +22,14 @@
     /**鍗″寘-鐘舵��*/
     private Integer effectiveStatus;
 
+    /**鍗″寘鎵�灞炵敤鎴�-鏍囪瘑*/
+    private String userId;
     /**鍗″寘鎵�灞炵敤鎴�-鍚嶇О*/
     private String userName;
     /**鍗″寘鎵�灞炵敤鎴�-CIQ*/
     private String userCiq;
+    /**鍗″寘鎵�灞炵敤鎴�-鐢ㄦ埛鎵�灞為棬搴�*/
+    private String userShopId;
 
     /**鍏宠仈鐨勬潈鐩�*/
     private List<UserCardEquityVo> userCardEquityVoList;

--
Gitblit v1.8.0