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

导出盲票

See merge request quanshu/mp-server!128

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

@@ -190,14 +190,14 @@ public class TicketBoxMgrController extends BaseApiController {
 				pageQueryWrapper.eq(Ticket::getBoxId, ids.getIds().get(0));
 				pageQueryWrapper.orderByAsc(Ticket::getSerialNo);
 				pageQueryWrapper.last("limit "+ (i*pageSize) +", " + pageSize);
-				List<Ticket> list = ticketService.listTicket(pageQueryWrapper);
+				List<Ticket> list = ticketService.list(pageQueryWrapper);
 				if(null != list && list.size() > 0 ) {
 					listAll.addAll(list);
 				}
 			}
 		}else {
 			queryWrapper.orderByAsc(Ticket::getSerialNo);
-			listAll = ticketService.listTicket(queryWrapper);
+			listAll = ticketService.list(queryWrapper);
 		}
 
 		if(null != listAll && listAll.size() > 0 ) {