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

取消订单取消判断线下票

See merge request quanshu/mp-server!854

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -350,8 +350,8 @@ public class UserTicketOrderServiceImpl extends
         int sumTicket = 0;
         for (String orderId : orderIds) {
             UserTicketOrder userTicketOrder = getById(orderId);
-            Assert.isTrue(userTicketOrder.getResource() == TicketTypeEnum.ONLINE,
-                "非在线盲票不用取消。boxId:" + boxId);
+//            Assert.isTrue(userTicketOrder.getResource() == TicketTypeEnum.ONLINE,
+//                "非在线盲票不用取消。boxId:" + boxId);
             if (!rollbackOrder(userTicketOrder)) {
                 return false;
             }