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

zss

3 天以前 d5d089eff99cd51695697679a95445b6b5b0d205

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