From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java
index f006f3a..1c76958 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java
@@ -3,6 +3,7 @@
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
public class GoodsPicture {
// 鍥剧墖閾炬帴
@@ -17,6 +18,9 @@
// 鍟嗗搧淇℃伅
@Expose
private TaoBaoGoodsBriefExtra goods;
+ // 鍟嗗搧淇℃伅
+ @Expose
+ private GoodsDetailVO goodsVO;
// 璺宠浆绫诲瀷
@Expose
private JumpDetailV2 jumpDetail;
@@ -132,5 +136,13 @@
public void setGoodState(int goodState) {
this.goodState = goodState;
}
+
+ public GoodsDetailVO getGoodsVO() {
+ return goodsVO;
+ }
+
+ public void setGoodsVO(GoodsDetailVO goodsVO) {
+ this.goodsVO = goodsVO;
+ }
}
--
Gitblit v1.8.0