From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpCenter.java | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 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..38c1f07 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,12 @@
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.springframework.format.annotation.DateTimeFormat;
+import org.yeshi.utils.mybatis.Column;
+import com.google.gson.annotations.Expose;
/**
* 甯姪涓績鏍囬
@@ -18,33 +15,47 @@
*
* @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
+ @Expose
@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")
+ @Expose
+ @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; // 鏉冮噸
-
- @JoinColumn(name = "h_createtime")
- @org.yeshi.utils.mybatis.Column(name = "h_createtime")
+
+ @Column(name = "h_state")
+ private Integer state;
+
+ @Column(name = "h_cid")
+ private HelpClass helpClass; // 鍒嗙被
+
+ //璧峰鏃堕棿
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "h_start_time")
+ private Date startTime;
+
+ //缁撴潫鏃堕棿
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "h_end_time")
+ private Date endTime;
+
+ @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() {
return id;
@@ -86,4 +97,36 @@
this.updatetime = updatetime;
}
+ public HelpClass getHelpClass() {
+ return helpClass;
+ }
+
+ public void setHelpClass(HelpClass helpClass) {
+ this.helpClass = helpClass;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
}
--
Gitblit v1.8.0