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

Dev

See merge request quanshu/mp-server!730

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

@@ -275,8 +275,9 @@ public class UserTicketOrderController extends BaseApiController {
         }
       }
     }
+    List<UserCouponVO> countUserCouponVOList = userCouponService.queryUserCouponList(userId, orderSettleVO.getOrderAmt(), ticketBox);
     TableDataInfo dataTable = getDataTable(userCouponVOList);
-    dataTable.setTotal(userCouponVOList.size());
+    dataTable.setTotal(countUserCouponVOList.size());
     return dataTable;
   }