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

gongchunyi

3 天以前 51c806f81b4498b2196025c97a94c51b1bb3eeb9

 src/main/java/com/ruoyi/production/pojo/ProductMaterial.java

@@ -38,10 +38,10 @@
    private Integer inventoryCategoryId;

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

    @ApiModelProperty("基本单位")
    private String baseUnit;
    private String unit;

    @ApiModelProperty("备注")
    private String remark;