From cc35e61d33b2421344bb22eb1ba50d093eacb562 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 18 四月 2023 18:28:53 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
index 47f86ca..cd2508f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
@@ -10,7 +10,8 @@
  */
 @Data
 public class CardBagDto extends PageDto {
-
+    /**鐢ㄦ埛鏍囪瘑*/
+    private String userId;
     /**鍗″寘鏍囪瘑*/
     private String cardBagId;
     /**鎿嶄綔鍛樺伐鏍囪瘑*/

--
Gitblit v1.8.0