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

gongchunyi

4 天以前 98af2bbf6d7c1c821919fc2221c4181479cdc562

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

@@ -33,7 +33,7 @@
    private Integer inventoryCategoryId;

    @ApiModelProperty("物料名称")
    private String materialName;
    private String productName;


}