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/entity/dynamic/DynamicInfo.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java
index 19e9270..b941838 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.dynamic;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -9,13 +10,18 @@
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@Document(collection = "dynamic_info")
-public class DynamicInfo {
+public class DynamicInfo implements Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
// 鍒嗕韩绫诲瀷 1:鍗曞浘鍒嗕韩 銆�2:4鍥惧垎浜�� 3:9鍥惧垎浜� 銆� 4:閭�璇峰垎浜�
public final static int SHARE_TYPE_ONE = 1;
public final static int SHARE_TYPE_FOUR = 2;
@@ -95,6 +101,11 @@
@Field("inviteMaterialId")
private String inviteMaterialId;
+ // 鍟嗗搧 鍒楄〃
+ @Field("listGoodsBrief")
+ private List<TaoBaoGoodsBrief> listGoodsBrief;
+
+
public String getInviteMaterialId() {
return inviteMaterialId;
@@ -232,4 +243,12 @@
this.updateTime = updateTime;
}
+ public List<TaoBaoGoodsBrief> getListGoodsBrief() {
+ return listGoodsBrief;
+ }
+
+ public void setListGoodsBrief(List<TaoBaoGoodsBrief> listGoodsBrief) {
+ this.listGoodsBrief = listGoodsBrief;
+ }
+
}
--
Gitblit v1.8.0