From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/vo/brand/TaoBaoShopVO.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/brand/TaoBaoShopVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/brand/TaoBaoShopVO.java
index 1885cfc..66eeed7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/brand/TaoBaoShopVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/brand/TaoBaoShopVO.java
@@ -1,28 +1,35 @@
package com.yeshi.fanli.vo.brand;
+import java.io.Serializable;
import java.util.List;
import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
-public class TaoBaoShopVO extends TaoBaoShop{
+public class TaoBaoShopVO extends TaoBaoShop implements Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private List<TaoBaoGoodsBrief> listGoodsBrief;
- @Expose
- private String shopLink;
@Expose
private List<TaoBaoGoodsBriefExtra> listGoods;
- public String getShopLink() {
- return shopLink;
- }
- public void setShopLink(String shopLink) {
- this.shopLink = shopLink;
- }
public List<TaoBaoGoodsBriefExtra> getListGoods() {
return listGoods;
}
public void setListGoods(List<TaoBaoGoodsBriefExtra> listGoods) {
this.listGoods = listGoods;
}
+ public List<TaoBaoGoodsBrief> getListGoodsBrief() {
+ return listGoodsBrief;
+ }
+ public void setListGoodsBrief(List<TaoBaoGoodsBrief> listGoodsBrief) {
+ this.listGoodsBrief = listGoodsBrief;
+ }
+
}
--
Gitblit v1.8.0