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

maven

13 小时以前 df2ff592a5b9037a747032f3351836e0c61fb4f9

 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java

@@ -84,9 +84,13 @@
    /**
     * 删除任务
     */
    public void unscheduleTimingTask(Long taskId) throws SchedulerException {
    public void unscheduleTimingTask(Long taskId){
        try {
        JobKey jobKey = new JobKey("timingTask_" + taskId);
        scheduler.deleteJob(jobKey);
        }catch (SchedulerException e){
            throw new RuntimeException(e);
        }
    }

    private JobDetail buildJobDetail(TimingTask task) {