chore: 合并失败

gongchunyi

3 天以前 b4c3f13af821d10a0ada7164bda95f23bac206e5

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

@@ -31,7 +31,7 @@
     * @param inspectId
     * @return
     */
    @GetMapping("/{id}")
    @GetMapping("/{inspectId}")
    public AjaxResult QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
        return AjaxResult.success(qualityInspectParamService.qualityInspectParamDetail(inspectId));
    }