Merge branch 'jtwy' into dev_New

zss

昨天 be09cd5461ee9e2589ed833510ac6a2a52ded6f3

 src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java

@@ -28,7 +28,10 @@

    @Override
    public Boolean addProductStructureDto(ProductStructureDto productStructureDto) {
        this.remove(new QueryWrapper<ProductStructure>().lambda().eq(ProductStructure::getProductModelId, productStructureDto.getProductModelId()));
        this.remove(new QueryWrapper<ProductStructure>().lambda().eq(ProductStructure::getParentId, productStructureDto.getParentId()));
        productStructureDto.getProductStructureList().forEach(productStructure -> {
            productStructure.setParentId(productStructureDto.getParentId());
        });
        return this.saveBatch(productStructureDto.getProductStructureList());
    }
}