Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

7 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

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

@@ -45,9 +45,7 @@

    @ApiOperation("删除报工")
    @DeleteMapping("/delete")
    @Transactional(rollbackFor = Exception.class)
    public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {

        return R.ok(productionProductMainService.removeProductMain(productionProductMainDto.getId()));
    }