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/SpecialCard.java |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
index 2c232f8..47ae175 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
@@ -57,8 +57,6 @@
 	private Date updatetime;
 	
 	
-	// 鏄惁瀹氭椂
-	private boolean timeTask;
 	// 璧峰鏃堕棿
 	private String startTime_str;
 	// 缁撴潫鏃堕棿
@@ -158,14 +156,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