From 4fb3f5e033c38afda6e7db013c53389732591efd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 20 八月 2019 17:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java |   11 +++++++++++
 1 files changed, 11 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 c4b0eff..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
@@ -58,6 +58,10 @@
 	@Expose
  	private List<String> tips;
 	
+	// 璧犻�佷腑-鍒嗕韩鍙d护
+	@Expose
+ 	private String giveTips;
+	
 	
 
 	public String getTopPicture() {
@@ -164,4 +168,11 @@
 		this.popup = popup;
 	}
 
+	public String getGiveTips() {
+		return giveTips;
+	}
+
+	public void setGiveTips(String giveTips) {
+		this.giveTips = giveTips;
+	}
 }

--
Gitblit v1.8.0