From 091a21654aa3a3effdcf0a3a3fbf982e6e4a9e99 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 14 十一月 2023 14:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 cd2508f..585cc39 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
@@ -14,6 +14,8 @@
     private String userId;
     /**鍗″寘鏍囪瘑*/
     private String cardBagId;
+    /**鍗″寘鏈夋晥鐘舵��*/
+    private Integer effectiveStatus;
     /**鎿嶄綔鍛樺伐鏍囪瘑*/
     private String opEmployeeId;
     /**鎿嶄綔闂ㄥ簵鏍囪瘑*/

--
Gitblit v1.8.0