From 8bc50178143e79597a4df6a280cd0c6129541d4c Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 13 十一月 2023 10:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1109-营销优惠券优化' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java |    4 +++-
 1 files changed, 3 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 98caee4..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,8 +23,10 @@
     private String effectiveStartTime;
     /**鏈夋晥缁撴潫*/
     private String effectiveEndTime;
-    /*鏄惁SPA(0:鍚�,1:鏄�)*/
+    /**鏄惁SPA(0:鍚�,1:鏄�)*/
     private Integer isSpa;
+    /**鏄惁澶辨晥:0鍚�1鏄�,澶辨晥瀵瑰簲鏈夋晥鐘舵�佺殑4鍜�5*/
+    private Integer isInvalid;
 
 }
 

--
Gitblit v1.8.0