From 393e3a365b5ebbed6e9eef07fbd18881cde73711 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 三月 2020 16:51:04 +0800
Subject: [PATCH] Merge branch 'div' into div-1

---
 fanli/src/main/java/com/yeshi/fanli/vo/goods/CouponInfoVO.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/goods/CouponInfoVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/goods/CouponInfoVO.java
index 5175004..9a345ab 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/goods/CouponInfoVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/goods/CouponInfoVO.java
@@ -16,7 +16,7 @@
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	@Expose
 	private int totalCount;// 鎬绘暟閲�
 	@Expose
@@ -33,6 +33,16 @@
 	private String link;// 鍒搁摼鎺�
 	@Expose
 	private String token; // 鍒稿彛浠�
+	@Expose
+	private boolean shopCoupon;// 鏄惁涓哄簵閾哄埜
+
+	public boolean isShopCoupon() {
+		return shopCoupon;
+	}
+
+	public void setShopCoupon(boolean shopCoupon) {
+		this.shopCoupon = shopCoupon;
+	}
 
 	public int getTotalCount() {
 		return totalCount;

--
Gitblit v1.8.0