From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 12 七月 2024 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test

---
 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