Merge branch 'dev_zj' into dev

zss

2025-03-06 218c85f5128b95cedcc20127c60d1915bb1f7bc6

 cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java

@@ -68,7 +68,7 @@
     * @return
     */
    @ApiOperation(value = "监控计划删除")
    @GetMapping("/delQualitySupervise")
    @DeleteMapping("/delQualitySupervise")
    public Result delQualitySupervise(Integer qualityMonitorId) {
        return Result.success(qualityMonitorService.removeById(qualityMonitorId));
    }