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

zss

16 小时以前 e0c8edd1d949fae5883a60019d02a9c5f7cb7a29

 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;