From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java | 7 ++++++-
1 files changed, 6 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 bce7547..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;
@@ -14,9 +15,13 @@
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;
--
Gitblit v1.8.0