From c0a77acc892d89bf7dd4a04a19d85ba71c0dd57c Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 26 八月 2024 16:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-rx-卡项促销活动分类' into master-jiayan-test

---
 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 585cc39..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,8 @@
     private String userId;
     /**鍗″寘鏍囪瘑*/
     private String cardBagId;
+    /**鏄惁涓嶆煡璇㈠彇娑堢殑鍗″寘:1涓嶆煡鐪嬪彇娑堢殑鍗″寘*/
+    private Integer selectNoCancel;
     /**鍗″寘鏈夋晥鐘舵��*/
     private Integer effectiveStatus;
     /**鎿嶄綔鍛樺伐鏍囪瘑*/

--
Gitblit v1.8.0