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

优化

See merge request quanshu/mp-server!733

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

@@ -120,7 +120,9 @@ public class UserTicketOrderMgrController extends BaseApiController {
             queryWrapper.in("t1.order_id",orderIds);
             queryWrapper.orderByDesc("t1.created_time");
             List<UserTicketOrderListVO> list = userTicketOrderService.listUserTicketOrder(queryWrapper);
-            return getDataTable(list);
+            TableDataInfo dataTable = getDataTable(userTicketOrderList);
+            dataTable.setRows(list);
+            return dataTable;
         }
         return getDataTable(userTicketOrderList);
     }