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

优化

See merge request quanshu/mp-server!633

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/MarketingController.java

@@ -259,6 +259,8 @@ public class MarketingController extends BaseApiController {
         if (userMarketingQueryParam.getTriggerStatus() == 0) {
             // 已开启的列表
             Date now = DateUtils.getNowDate();
+            // 开始时间小于当前时间的
+            queryWrapper.le(Marketing::getStartTime, now);
             // 结束时间大于当前时间的
             queryWrapper.gt(Marketing::getEndTime, now);
             queryWrapper.orderByAsc(Marketing::getStartTime);