From c96375400afce5cd0be41e8af0eb7e8deb484994 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 十二月 2019 14:03:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpCenter.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 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 0b3a1bb..64b2189 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
@@ -3,7 +3,10 @@
import java.io.Serializable;
import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
import org.yeshi.utils.mybatis.Column;
+
+import com.google.gson.annotations.Expose;
/**
* 甯姪涓績鏍囬
@@ -20,9 +23,11 @@
*/
private static final long serialVersionUID = 1L;
+ @Expose
@Column(name = "h_id")
private Long id;
+ @Expose
@Column(name = "h_title")
private String title;// 鍚嶇О
@@ -32,12 +37,22 @@
@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; // 鍒涘缓鏃堕棿
@Column(name = "h_updatetime")
private Date updatetime; // 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
+
public Long getId() {
return id;
@@ -87,4 +102,20 @@
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;
+ }
+
}
--
Gitblit v1.8.0