Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-03-08 09481ada804b04e6458c8fa462e187a9b3007ee7

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -297,6 +297,7 @@

    /**
     * 删除任务
     *
     * @param taskId
     * @return0：成功   1：任务不处于空闲状态 2:服务器删除失败
     */
@@ -311,8 +312,7 @@
            broadcastV2TaskFileService.removeById(taskId);
            broadcastV2TaskTerminalService.removeById(taskId);
            return 0;
        }
        else {
        } else {
            return del;
        }