Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java

@@ -177,7 +177,7 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")

    @Log(title = "定时任务", businessType = BusinessType.DELETE)

    @DeleteMapping("/{jobIds}")

    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException

    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException

    {

        jobService.deleteJobByIds(jobIds);

        return success();