From d22d18f40d088277195e5c3ab587d07450f1a94d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 四月 2020 18:22:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java |   19 -------------------
 1 files changed, 0 insertions(+), 19 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 dade9f3..ffe4064 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
@@ -14,13 +14,6 @@
 /**
  * 涓撻绠$悊
  * 
- * @author yj
- *
- * @date 2018骞�10鏈�23鏃�
- */
-/**
- * @author Administrator
- *
  */
 @Table("yeshi_ec_special")
 public class Special implements Serializable {
@@ -151,10 +144,6 @@
 	// 闄愬埗鏈�浣庣増鏈�
 	private String version;
 	
-	
-	// 鏄惁瀹氭椂
-	@Expose
-	private boolean timeTask;
 	// 璧峰鏃堕棿
 	private String startTime_str;
 	// 缁撴潫鏃堕棿
@@ -408,14 +397,6 @@
 
 	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() {

--
Gitblit v1.8.0