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

盲票删除

See merge request quanshu/mp-server!116

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

@@ -160,7 +160,7 @@ public class TicketBoxMgrController extends BaseApiController {
 			return AjaxResult.error("参数缺失");
 		}
 		TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
-		if (param.getStatus() != TicketBoxStatusEnum.DONE) {
+		if (ticketBox.getStatus() != TicketBoxStatusEnum.DONE) {
 			return AjaxResult.error("当前状态不是待上架，不能删除");
 		}
 		ticketBoxService.removeTicketBox(param.getBoxId());