From bba4dceccfb4d1c38b41ca3e7f9e6bc98f34d85f Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 23 十一月 2022 19:05:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java
index 78ac8ff..7b2ad58 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java
@@ -23,6 +23,11 @@
     private String effectiveStartTime;
     /**鏈夋晥缁撴潫*/
     private String effectiveEndTime;
+    /**鏄惁SPA(0:鍚�,1:鏄�)*/
+    private Integer isSpa;
+    /**鏄惁澶辨晥:0鍚�1鏄�,澶辨晥瀵瑰簲鏈夋晥鐘舵�佺殑4鍜�5*/
+    private Integer isInvalid;
+
 }
 
 

--
Gitblit v1.8.0