From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 12:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/vo/goods/GoodsDetailExtraVO.java |   16 ++--------------
 1 files changed, 2 insertions(+), 14 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 5a4fe33..153c7b7 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
@@ -6,7 +6,6 @@
 import com.google.gson.annotations.Expose;
 import com.yeshi.fanli.entity.bus.user.ShamUser;
 import com.yeshi.fanli.entity.taobao.ClientTBPid;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 
 /**
  * 鍟嗗搧璇︽儏棰濆鏄剧ず淇℃伅
@@ -39,17 +38,13 @@
 	// 鏄惁璺宠浆鍘熺敓APP
 	@Expose
 	private Boolean isNative;
-
-	
+		
 	// 鍥炬枃璇︽儏閾炬帴
 	@Expose
 	private String detailUrl;
 	// 澶嶅埗閾炬帴锛堝彸涓婅锛�
 	@Expose
 	private String h5Url;
-	// 搴曢儴鎻愮ず璇�
-	@Expose
-	private List<ClientTextStyleVO> tip;
 
 	// 娣樺鍙傛暟
 	@Expose
@@ -160,14 +155,6 @@
 		this.h5Url = h5Url;
 	}
 
-	public List<ClientTextStyleVO> getTip() {
-		return tip;
-	}
-
-	public void setTip(List<ClientTextStyleVO> tip) {
-		this.tip = tip;
-	}
-
 	public String getUserTLJ() {
 		return userTLJ;
 	}
@@ -199,4 +186,5 @@
 	public void setListCouponUser(List<ShamUser> listCouponUser) {
 		this.listCouponUser = listCouponUser;
 	}
+
 }

--
Gitblit v1.8.0