From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +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 | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 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..37761a3 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.vo.user;
import java.io.Serializable;
+import java.util.List;
import java.util.Map;
import com.google.gson.annotations.Expose;
@@ -20,26 +21,51 @@
// 鍒稿浘鐗�
@Expose
private String couponPicture;
+
+ // 鍒稿浘鐗�- 澶辨晥
+ private String couponPictureInvalid;
+
// 鍒镐綔鐢�
@Expose
private String couponEffect;
+
// 鍒歌鍒�
@Expose
private String couponRule;
- // 鏈夋晥鏈�
+
+ // 鍒歌鍒�-閾炬帴
@Expose
- private String couponTerm;
+ private String couponRuleLink;
// 鏈夋晥鏈�
@Expose
- private String couponState;
-
+ private String couponTerm;
+ // 浣跨敤涓鏄�
+ @Expose
+ private String inUseExplain;
+
// 璺宠浆鎸夐挳
@Expose
private Map<String, Object> jumpBtn;
+
// 鍓╀笅澶╂暟
@Expose
private Map<String, Object> remainDays;
+
+ @Expose
+ private boolean popup;
+
+ @Expose
+ private List<String> tips;
+
+ // 浣跨敤涓鏄�1.6.5
+ @Expose
+ private List<String> tipsUsing;
+
+ // 璧犻�佷腑-鍒嗕韩鍙ｄ护
+ @Expose
+ private String giveTips;
+
public String getTopPicture() {
@@ -105,5 +131,60 @@
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;
+ }
+
+ public String getCouponRuleLink() {
+ return couponRuleLink;
+ }
+
+ public void setCouponRuleLink(String couponRuleLink) {
+ this.couponRuleLink = couponRuleLink;
+ }
+
+ public List<String> getTips() {
+ return tips;
+ }
+
+ public void setTips(List<String> tips) {
+ this.tips = tips;
+ }
+
+ public boolean isPopup() {
+ return popup;
+ }
+
+ public void setPopup(boolean popup) {
+ this.popup = popup;
+ }
+
+ public String getGiveTips() {
+ return giveTips;
+ }
+
+ public void setGiveTips(String giveTips) {
+ this.giveTips = giveTips;
+ }
+
+ public List<String> getTipsUsing() {
+ return tipsUsing;
+ }
+
+ public void setTipsUsing(List<String> tipsUsing) {
+ this.tipsUsing = tipsUsing;
+ }
}
--
Gitblit v1.8.0