From e9a3f108de4f79fe6f246cd30f4427fc6aad5450 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 05 九月 2019 18:00:06 +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/DynamicInfo.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 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 a8aefa2..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;
@@ -91,6 +97,23 @@
@Field("activityId")
private Long activityId;
+ // 閭�璇风礌鏉恑d
+ @Field("inviteMaterialId")
+ private String inviteMaterialId;
+
+ // 鍟嗗搧 鍒楄〃
+ @Field("listGoodsBrief")
+ private List<TaoBaoGoodsBrief> listGoodsBrief;
+
+
+
+ public String getInviteMaterialId() {
+ return inviteMaterialId;
+ }
+
+ public void setInviteMaterialId(String inviteMaterialId) {
+ this.inviteMaterialId = inviteMaterialId;
+ }
public DynamicInfo() {
}
@@ -220,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