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

gongchunyi

8 天以前 86a19fc0b8fe415adb353c789b228c63612d980a

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

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

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


}