Merge branch 'dev_cr' into dev

zhuo

2025-02-28 217e39bec2ae2a861c4619d277ab0bc823cf85d4

 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));
    }