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

maven

18 小时以前 df2ff592a5b9037a747032f3351836e0c61fb4f9

 src/main/java/com/ruoyi/production/controller/ProcessRouteController.java

@@ -29,7 +29,7 @@
    @ApiOperation("新增工艺路线")
    @PostMapping ()
    public R add(@RequestBody  ProcessRoute processRoute) {
        return R.ok(processRouteService.save(processRoute));
        return R.ok(processRouteService.saveProcessRoute(processRoute));
    }
    @ApiOperation("修改工艺路线")
    @PutMapping ()