From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java |   32 +++++++++++++-------------------
 1 files changed, 13 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..77c1ee6 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 {
@@ -140,6 +133,9 @@
 	// 鏄惁寮规
 	@Expose
 	private boolean elastic;
+	@Expose // 鏄惁鍊掕鏃�
+	private boolean timeTask;
+	
 
 	// 鑳屾櫙鍥剧墖
 	private String bottomPicture;
@@ -151,14 +147,12 @@
 	// 闄愬埗鏈�浣庣増鏈�
 	private String version;
 	
-	
-	// 鏄惁瀹氭椂
-	@Expose
-	private boolean timeTask;
 	// 璧峰鏃堕棿
 	private String startTime_str;
 	// 缁撴潫鏃堕棿
 	private String endTime_str;
+	
+	
 	
 	@Expose
 	private long countDownTime;//鍊掕鏃�
@@ -410,14 +404,6 @@
 		this.endTime = endTime;
 	}
 
-	public boolean isTimeTask() {
-		return timeTask;
-	}
-
-	public void setTimeTask(boolean timeTask) {
-		this.timeTask = timeTask;
-	}
-
 	public String getStartTime_str() {
 		return startTime_str;
 	}
@@ -450,4 +436,12 @@
 		this.listLabels = listLabels;
 	}
 
+	public boolean isTimeTask() {
+		return timeTask;
+	}
+
+	public void setTimeTask(boolean timeTask) {
+		this.timeTask = timeTask;
+	}
+
 }

--
Gitblit v1.8.0