From e586f040a9b148850c85d967a9dec5b235f6491e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 21:10:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java | 13 +++++++++++++
1 files changed, 13 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 ffe4064..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
@@ -133,6 +133,9 @@
// 鏄惁寮规
@Expose
private boolean elastic;
+ @Expose // 鏄惁鍊掕鏃�
+ private boolean timeTask;
+
// 鑳屾櫙鍥剧墖
private String bottomPicture;
@@ -148,6 +151,8 @@
private String startTime_str;
// 缁撴潫鏃堕棿
private String endTime_str;
+
+
@Expose
private long countDownTime;//鍊掕鏃�
@@ -431,4 +436,12 @@
this.listLabels = listLabels;
}
+ public boolean isTimeTask() {
+ return timeTask;
+ }
+
+ public void setTimeTask(boolean timeTask) {
+ this.timeTask = timeTask;
+ }
+
}
--
Gitblit v1.8.0