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/controller/client/v2/DynamicControllerV2.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 97e7398..34bc31e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -387,6 +387,7 @@
if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
continue;
} else {
+ special.setTimeTask(true);
special.setCountDownTime((special.getEndTime().getTime() - time) / 1000);
}
}
--
Gitblit v1.8.0