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

gongchunyi

2 天以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

@@ -50,7 +50,8 @@
    @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()));
    }