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

gongchunyi

9 天以前 f9c24cdd04de07001f078ea093b724e647ac35b2

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

@@ -48,9 +48,8 @@

    @ApiOperation("删除报工")
    @DeleteMapping("/delete")
    @Transactional(rollbackFor = Exception.class)
    public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {
        return R.ok(productionProductMainService.removeProductMain(productionProductMainDto));
        return R.ok(productionProductMainService.removeProductMain(productionProductMainDto.getId()));
    }