From b47abee8e59cfb2a5af241d34b397e41eed0155a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 12:01:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java | 12 ++++++++++++
1 files changed, 12 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 4ba12b2..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
@@ -58,6 +58,10 @@
@Expose
private List<String> tips;
+ // 浣跨敤涓鏄�1.6.5
+ @Expose
+ private List<String> tipsUsing;
+
// 璧犻�佷腑-鍒嗕韩鍙ｄ护
@Expose
private String giveTips;
@@ -175,4 +179,12 @@
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