From a381a654833decf21cad316ffbda8b3e9c834118 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 19:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java
index 9b4eb5d..287e416 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java
@@ -29,11 +29,10 @@
// 鏈夋晥鏈�
@Expose
private String couponTerm;
-
- // 鏈夋晥鏈�
+ // 浣跨敤涓鏄�
@Expose
- private String couponState;
-
+ private String inUseExplain;
+
// 璺宠浆鎸夐挳
@Expose
private Map<String, Object> jumpBtn;
@@ -105,5 +104,13 @@
public void setJumpBtn(Map<String, Object> jumpBtn) {
this.jumpBtn = jumpBtn;
}
-
+
+ public String getInUseExplain() {
+ return inUseExplain;
+ }
+
+ public void setInUseExplain(String inUseExplain) {
+ this.inUseExplain = inUseExplain;
+ }
+
}
--
Gitblit v1.8.0