Merge branch 'dev' of maopiao/mp-server into mp-server-test

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

@@ -488,7 +488,7 @@ public class TicketBoxMgrController extends BaseApiController {
             return AjaxResult.error("参数缺失");
         }
         TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
-        if(ticketBox.getStatus() == TicketBoxStatusEnum.PUT_ON && ticketBox.getType() == TicketTypeEnum.OFFLINE){
+        if((ticketBox.getStatus() == TicketBoxStatusEnum.PUT_ON || ticketBox.getStatus() == TicketBoxStatusEnum.PUT_OFF) && ticketBox.getType() == TicketTypeEnum.OFFLINE){
             ticketBoxService.update(new LambdaUpdateWrapper<TicketBox>()
                 .set(TicketBox::getStatus, TicketBoxStatusEnum.STOP)
                 .eq(TicketBox::getBoxId, ticketBox.getBoxId()));