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/bus/help/HelpCenter.java |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 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 e410ec8..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,15 +1,9 @@
 package com.yeshi.fanli.entity.bus.help;
 
+import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Table;
-
+import org.yeshi.utils.mybatis.Column;
 
 /**
  * 甯姪涓績鏍囬
@@ -18,32 +12,31 @@
  *
  * @date 2018骞�8鏈�14鏃�
  */
-@Entity
-@Table(name = "yeshi_ec_help_center")
 @org.yeshi.utils.mybatis.Table("yeshi_ec_help_center")
-public class HelpCenter {
+public class HelpCenter implements Serializable{
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-	@Id
 	@Column(name = "h_id")
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@org.yeshi.utils.mybatis.Column(name = "h_id")
 	private Long id;
 
-	@JoinColumn(name = "h_title")
-	@org.yeshi.utils.mybatis.Column(name = "h_title")
+	@Column(name = "h_title")
 	private String title;// 鍚嶇О
 
-	@JoinColumn(name = "h_weight")
-	@org.yeshi.utils.mybatis.Column(name = "h_weight")
+	@Column(name = "h_weight")
 	private Integer weight; // 鏉冮噸
+	
+	@Column(name = "h_cid")
+	private HelpClass helpClass; // 鍒嗙被
+	
 
-	@JoinColumn(name = "h_createtime")
-	@org.yeshi.utils.mybatis.Column(name = "h_createtime")
+	@Column(name = "h_createtime")
 	private Date createtime; // 鍒涘缓鏃堕棿
 
-	@JoinColumn(name = "h_updatetime")
-	@org.yeshi.utils.mybatis.Column(name = "h_updatetime")
+	@Column(name = "h_updatetime")
 	private Date updatetime; // 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
 
 	public Long getId() {
@@ -86,4 +79,12 @@
 		this.updatetime = updatetime;
 	}
 
+	public HelpClass getHelpClass() {
+		return helpClass;
+	}
+
+	public void setHelpClass(HelpClass helpClass) {
+		this.helpClass = helpClass;
+	}
+
 }

--
Gitblit v1.8.0