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/HelpCenter.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpCenter.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpCenter.java
index ccce067..0b3a1bb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpCenter.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpCenter.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.bus.help;
+import java.io.Serializable;
import java.util.Date;
import org.yeshi.utils.mybatis.Column;
@@ -12,7 +13,12 @@
* @date 2018骞�8鏈�14鏃�
*/
@org.yeshi.utils.mybatis.Table("yeshi_ec_help_center")
-public class HelpCenter {
+public class HelpCenter implements Serializable{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
@Column(name = "h_id")
private Long id;
--
Gitblit v1.8.0