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/bus/help/HelpInfo.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpInfo.java
index f31f8d4..88805f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpInfo.java
@@ -1,5 +1,7 @@
package com.yeshi.fanli.entity.bus.help;
+import java.io.Serializable;
+
import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.PersistenceConstructor;
import org.springframework.data.mongodb.core.mapping.Document;
@@ -11,7 +13,11 @@
*
*/
@Document(collection = "helpInfo")
-public class HelpInfo {
+public class HelpInfo implements Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
@Id
private Long id;// 甯姪涓績ID
private String content;// 鍏蜂綋鍐呭
--
Gitblit v1.8.0