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

zss

10 小时以前 e45f6b4649edf03df3973a7dbe76b53b7e57a366

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

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

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


}