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

取消订单不区分线上线下票

See merge request quanshu/mp-server!853

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

@@ -40,7 +40,7 @@ public class TicketOrderTask {
       List<UserTicketOrder> ticketOrderList = userTicketOrderService.list(
           new QueryWrapper<UserTicketOrder>()
               .select("distinct box_id")
-              .lambda().eq(UserTicketOrder::getResource, TicketTypeEnum.ONLINE)
+              .lambda()
               .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY)
               .lt(UserTicketOrder::getCreatedTime,
                   DateUtils.addMinutes(DateUtils.getNowDate(), -30))