From 47f157086a556d96e7bcfc9adfe17ecf7c154dfe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 08 六月 2020 17:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/vo/goods/GoodsDetailExtraVO.java |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/goods/GoodsDetailExtraVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/goods/GoodsDetailExtraVO.java
index 45ad403..e2c2f2c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/goods/GoodsDetailExtraVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/goods/GoodsDetailExtraVO.java
@@ -19,7 +19,7 @@
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	// 鏄惁IOS涓婄嚎
 	@Expose
 	private boolean iosOnling;
@@ -38,7 +38,7 @@
 	// 鏄惁璺宠浆鍘熺敓APP
 	@Expose
 	private Boolean isNative;
-		
+
 	// 鍥炬枃璇︽儏閾炬帴
 	@Expose
 	private String detailUrl;
@@ -63,11 +63,23 @@
 	@Expose
 	private List<ShamUser> listCouponUser;
 	@Expose
-	private String couponJumpLink;//鍒歌烦杞摼鎺ワ紝鎷煎澶氫笓鐢�
+	private String couponJumpLink;// 鍒歌烦杞摼鎺ワ紝鎷煎澶氫笓鐢�
 	@Expose
-	private String nativeCouponJumpLink;//鍘熺敓鍒歌烦杞摼鎺ワ紝鎷煎澶氫笓鐢�
+	private String nativeCouponJumpLink;// 鍘熺敓鍒歌烦杞摼鎺ワ紝鎷煎澶氫笓鐢�
 	@Expose
-	private Boolean vip;//鏄惁涓篤IP
+	private Boolean vip;// 鏄惁涓篤IP
+
+	// 浜戝彂鍗曟枃瀛�
+	@Expose
+	private boolean cloudOpen;
+	@Expose
+	private String cloudPic;
+	// 浜戝彂鍗曟枃瀛�
+	@Expose
+	private String cloudText;
+	
+	
+	
 
 	public Boolean getVip() {
 		return vip;
@@ -197,4 +209,28 @@
 		this.listCouponUser = listCouponUser;
 	}
 
+	public String getCloudPic() {
+		return cloudPic;
+	}
+
+	public void setCloudPic(String cloudPic) {
+		this.cloudPic = cloudPic;
+	}
+
+	public String getCloudText() {
+		return cloudText;
+	}
+
+	public void setCloudText(String cloudText) {
+		this.cloudText = cloudText;
+	}
+
+	public boolean isCloudOpen() {
+		return cloudOpen;
+	}
+
+	public void setCloudOpen(boolean cloudOpen) {
+		this.cloudOpen = cloudOpen;
+	}
+	
 }

--
Gitblit v1.8.0