From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' 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