From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +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 | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 1152413..4ba12b2 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
@@ -47,12 +47,20 @@
// 璺宠浆鎸夐挳
@Expose
private Map<String, Object> jumpBtn;
+
// 鍓╀笅澶╂暟
@Expose
private Map<String, Object> remainDays;
@Expose
+ private boolean popup;
+
+ @Expose
private List<String> tips;
+
+ // 璧犻�佷腑-鍒嗕韩鍙ｄ护
+ @Expose
+ private String giveTips;
@@ -152,4 +160,19 @@
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;
+ }
}
--
Gitblit v1.8.0