From 9f53055abd60eb0fb5d8060587124012d77d8ab6 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 23 三月 2023 17:08:44 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 0fd807a..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
@@ -4,7 +4,7 @@
 import lombok.Data;
 
 /**
- * 鐢ㄦ埛椤圭洰鎵╁睍
+ * 鐢ㄦ埛鍗¢」
  * @author fwq
  * */
 @Data
@@ -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