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

Dev

See merge request quanshu/mp-server!122

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

@@ -196,6 +196,7 @@ public class TicketBoxMgrController extends BaseApiController {
 				}
 			}
 		}else {
+			queryWrapper.orderByAsc(Ticket::getSerialNo);
 			listAll = ticketService.list(queryWrapper);
 		}
 

mp-admin/src/main/resources/application.yml

@@ -15,7 +15,7 @@ mp:
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   # 盲票导出baseUrl
-  exportUrl: https://adm.51jiazhu.com/jump.html?no=
+  exportUrl: https://mp-agent.51jiazhu.com/jump.html?id=
 
 # 开发环境配置
 server: