From 05e9aa8a610932d706d48257a36e95cec9de39fa Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 22 二月 2024 19:22:37 +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 | 7 ++++++-
1 files changed, 6 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..b882ebf 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,9 +10,14 @@
*/
@Data
public class CardBagDto extends PageDto {
-
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
/**鍗″寘鏍囪瘑*/
private String cardBagId;
+ /**鏄惁涓嶆煡璇㈠彇娑堢殑鍗″寘:1涓嶆煡鐪嬪彇娑堢殑鍗″寘*/
+ private Integer selectNoCancel;
+ /**鍗″寘鏈夋晥鐘舵��*/
+ private Integer effectiveStatus;
/**鎿嶄綔鍛樺伐鏍囪瘑*/
private String opEmployeeId;
/**鎿嶄綔闂ㄥ簵鏍囪瘑*/
--
Gitblit v1.8.0