From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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..d27ac0e 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
@@ -20,6 +20,10 @@
// 鍒稿浘鐗�
@Expose
private String couponPicture;
+
+ // 鍒稿浘鐗�- 澶辨晥
+ private String couponPictureInvalid;
+
// 鍒镐綔鐢�
@Expose
private String couponEffect;
@@ -29,11 +33,10 @@
// 鏈夋晥鏈�
@Expose
private String couponTerm;
-
- // 鏈夋晥鏈�
+ // 浣跨敤涓鏄�
@Expose
- private String couponState;
-
+ private String inUseExplain;
+
// 璺宠浆鎸夐挳
@Expose
private Map<String, Object> jumpBtn;
@@ -105,5 +108,21 @@
public void setJumpBtn(Map<String, Object> jumpBtn) {
this.jumpBtn = jumpBtn;
}
-
+
+ public String getInUseExplain() {
+ return inUseExplain;
+ }
+
+ public void setInUseExplain(String inUseExplain) {
+ this.inUseExplain = inUseExplain;
+ }
+
+ public String getCouponPictureInvalid() {
+ return couponPictureInvalid;
+ }
+
+ public void setCouponPictureInvalid(String couponPictureInvalid) {
+ this.couponPictureInvalid = couponPictureInvalid;
+ }
+
}
--
Gitblit v1.8.0