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/controller/wxmp/v1/DynamicController.java | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
index 58c3a47..b4c0e72 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
@@ -130,12 +130,7 @@
if (special.getState() == 1L) {
list.remove(i--);
} else {
- if (special.getStartTime() != null && special.getEndTime() != null)
- special.setTimeTask(true);
- else
- special.setTimeTask(false);
-
- if (special.isTimeTask()) {
+ if (special.getStartTime() != null && special.getEndTime() != null) {
if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
list.remove(i--);
} else// 璁剧疆鍊掕鏃�
--
Gitblit v1.8.0