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

zss

昨天 aa3d1a0d6e0211ebd4c85a5ebd3847f64c59b4ac

 src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java

@@ -53,7 +53,7 @@
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        return AjaxResult.success(qualityTestStandardService.removeBatchByIds(ids));
        return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
    }

    /**