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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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