Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

3 天以前 f3cf05b74840f57f632af858ee27aab1d937cab8

 src/main/java/com/ruoyi/production/dto/ProductMaterialGroupDto.java

@@ -26,5 +26,5 @@
    private String configName;

    @ApiModelProperty("物料列表")
    private List<ProductMaterial> materialList;
    private List<ProductMaterialDto> materialList;
}