From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期一, 23 十月 2023 16:45:19 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java | 5 ++++- 1 files changed, 4 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..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 @@ -10,9 +10,12 @@ */ @Data public class CardBagDto extends PageDto { - + /**鐢ㄦ埛鏍囪瘑*/ + private String userId; /**鍗″寘鏍囪瘑*/ private String cardBagId; + /**鍗″寘鏈夋晥鐘舵��*/ + private Integer effectiveStatus; /**鎿嶄綔鍛樺伐鏍囪瘑*/ private String opEmployeeId; /**鎿嶄綔闂ㄥ簵鏍囪瘑*/ -- Gitblit v1.8.0