From 87a9aade5539d7be459059ab07566af148b40a0e Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期三, 28 十二月 2022 19:04:50 +0800
Subject: [PATCH] Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-prod-new

---
 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