From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/brand/TaoBaoShopVO.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 66eeed7..a999d1a 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
@@ -7,6 +7,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
public class TaoBaoShopVO extends TaoBaoShop implements Serializable{
/**
@@ -19,6 +20,9 @@
@Expose
private List<TaoBaoGoodsBriefExtra> listGoods;
+ @Expose
+ private List<GoodsDetailVO> listGoodsVO;
+
public List<TaoBaoGoodsBriefExtra> getListGoods() {
return listGoods;
}
@@ -31,5 +35,11 @@
public void setListGoodsBrief(List<TaoBaoGoodsBrief> listGoodsBrief) {
this.listGoodsBrief = listGoodsBrief;
}
+ public List<GoodsDetailVO> getListGoodsVO() {
+ return listGoodsVO;
+ }
+ public void setListGoodsVO(List<GoodsDetailVO> listGoodsVO) {
+ this.listGoodsVO = listGoodsVO;
+ }
}
--
Gitblit v1.8.0