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

优化

See merge request quanshu/mp-server!729

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

@@ -275,7 +275,9 @@ public class UserTicketOrderController extends BaseApiController {
         }
       }
     }
-    return getDataTable(userCouponVOList);
+    TableDataInfo dataTable = getDataTable(userCouponVOList);
+    dataTable.setTotal(userCouponVOList.size());
+    return dataTable;
   }
 
 }