From f7fc64d5ed3d19e131bc84398ae7e801ff30341e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 九月 2019 15:28:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
index 6dab052..8d756f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
@@ -117,6 +117,14 @@
// ios鏈�灏忕増鏈�
@Column(name = "b_min_ios_version_code")
private Integer minIOSVersionCode;
+
+ //璧峰鏃堕棿
+ @Column(name = "b_start_time")
+ private Date startTime;
+
+ //缁撴潫鏃堕棿
+ @Column(name = "b_end_time")
+ private Date endTime;
// 鍒涘缓鏃堕棿
@Column(name = "b_createtime")
@@ -139,6 +147,14 @@
// 闄愬埗鏈�浣庣増鏈�
private String version;
+
+
+ // 鏄惁瀹氭椂
+ private boolean timeTask;
+ // 璧峰鏃堕棿
+ private String startTime_str;
+ // 缁撴潫鏃堕棿
+ private String endTime_str;
public Long getId() {
return id;
@@ -357,4 +373,44 @@
this.minIOSVersionCode = minIOSVersionCode;
}
+ 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 boolean isTimeTask() {
+ return timeTask;
+ }
+
+ public void setTimeTask(boolean timeTask) {
+ this.timeTask = timeTask;
+ }
+
+ 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