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

zss

昨天 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

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

@@ -60,10 +60,10 @@
     * 根据调度编号获取详细信息

     */

    @PreAuthorize("@ss.hasPermi('monitor:job:query')")

    @GetMapping(value = "/{configId}")

    @GetMapping(value = "/{jobLogId}")

    public AjaxResult getInfo(@PathVariable Long jobLogId)

    {

        return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));

        return success(jobLogService.selectJobLogById(jobLogId));

    }





@@ -87,6 +87,6 @@
    public AjaxResult clean()

    {

        jobLogService.cleanJobLog();

        return AjaxResult.success();

        return success();

    }

}