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

zss

昨天 f68d79d0ff6658795c19c2fd473fab9ff6f0640d

 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;
}