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/dto/card/CardBagDto.java | 4 ++++
1 files changed, 4 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..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
@@ -14,6 +14,10 @@
private String userId;
/**鍗″寘鏍囪瘑*/
private String cardBagId;
+ /**鏄惁涓嶆煡璇㈠彇娑堢殑鍗″寘:1涓嶆煡鐪嬪彇娑堢殑鍗″寘*/
+ private Integer selectNoCancel;
+ /**鍗″寘鏈夋晥鐘舵��*/
+ private Integer effectiveStatus;
/**鎿嶄綔鍛樺伐鏍囪瘑*/
private String opEmployeeId;
/**鎿嶄綔闂ㄥ簵鏍囪瘑*/
--
Gitblit v1.8.0