From a525f3faae1d749ccceefeb10612ab59cf4d9c1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 三月 2019 13:17:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
index 1d1e441..8e18410 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
@@ -61,12 +61,12 @@
private boolean jumpNeedLogin;
// 璧峰鏃堕棿
- @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "fa_start_time")
private Date startTime;
// 缁撴潫鏃ユ湡
- @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "fa_end_time")
private Date endTime;
@@ -90,6 +90,10 @@
@Column(name = "fa_update_time")
private Date updateTime;
+ // 璧峰鏃堕棿
+ private String startTime_str;
+ // 缁撴潫鏃堕棿
+ private String endTime_str;
@@ -204,4 +208,22 @@
public void setShowMode(String showMode) {
this.showMode = showMode;
}
+
+ public String getStartTime_str() {
+ return startTime_str;
+ }
+
+ public void setStartTime_str(String startTime_str) {
+ this.startTime_str = startTime_str;
+ }
+
+ public String getEndTime_str() {
+ return endTime_str;
+ }
+
+ public void setEndTime_str(String endTime_str) {
+ this.endTime_str = endTime_str;
+ }
+
+
}
--
Gitblit v1.8.0