Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!533

mp-quartz/src/main/java/com/qs/mp/quartz/task/MarketingTask.java

@@ -161,8 +161,8 @@ public class MarketingTask {
         List<Marketing> marketingList = marketingService.list(new LambdaQueryWrapper<Marketing>()
                 .eq(Marketing::getTriggerStatus, 0)
                 .eq(Marketing::getIsOn, MarketingStatusEnum.ON.getValue())
-                .gt(Marketing::getStartTime, now)
-                .lt(Marketing::getEndTime, now));
+                .lt(Marketing::getStartTime, now)
+                .gt(Marketing::getEndTime, now));
         if (CollectionUtils.isEmpty(marketingList)) {
             return;
         }