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

liyong

昨天 dbd7fd484b5c7ed00cb895f227645848c3677c08

 src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java

@@ -52,7 +52,7 @@
    /**
     * 修改工艺路线。
     */
    @PutMapping("editTechRoute")
    @PutMapping("/editTechRoute")
    @Operation(summary = "修改工艺路线")
    public R edit(@RequestBody TechnologyRouting technologyRouting) {
        return R.ok(technologyRoutingService.updateTechnologyRouting(technologyRouting));
@@ -67,5 +67,4 @@
        return R.ok(technologyRoutingService.removeTechnologyRouting(ids));
    }

    //TODO 增加工艺路线附件上传 @陈海杰
}