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

优化

See merge request quanshu/mp-server!634

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

@@ -263,8 +263,7 @@ public class MarketingController extends BaseApiController {
             queryWrapper.le(Marketing::getStartTime, now);
             // 结束时间大于当前时间的
             queryWrapper.gt(Marketing::getEndTime, now);
-            queryWrapper.orderByAsc(Marketing::getStartTime);
-            queryWrapper.orderByAsc(Marketing::getEndTime);
+            queryWrapper.orderByAsc(Marketing::getEndTime, Marketing::getStartTime);
         }else if(userMarketingQueryParam.getTriggerStatus() == 1) {
             // 开奖的排序
             queryWrapper.orderByDesc(Marketing::getEndTime);