From 4c4646819beb205c070c34737c0b94d7084d548f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.1.106>
Date: 星期二, 03 三月 2020 13:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/dynamic/ImgInfo.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/ImgInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/ImgInfo.java
index ebf3e6b..0529b65 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/ImgInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/ImgInfo.java
@@ -3,6 +3,7 @@
import java.io.Serializable;
import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
public class ImgInfo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -55,6 +56,8 @@
// 鍟嗗搧淇℃伅
@Expose
private SimpleGoods goods;
+
+ private GoodsDetailVO goodsVO;
private String activityPic;
private String activityUrl;
@@ -154,5 +157,13 @@
public void setActivityPic(String activityPic) {
this.activityPic = activityPic;
}
+
+ public GoodsDetailVO getGoodsVO() {
+ return goodsVO;
+ }
+
+ public void setGoodsVO(GoodsDetailVO goodsVO) {
+ this.goodsVO = goodsVO;
+ }
}
--
Gitblit v1.8.0