Merge remote-tracking branch 'origin/master'

mitao

6 天以前 9c76b7efccd70395231b032a193a89f7638b657e

 ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageListVO.java

@@ -19,7 +19,7 @@
    @ApiModelProperty(value = "规格型号")
    private String specificationModel;
    @ApiModelProperty(value = "资产类型")
    private String assetTypeName;
    private String category;
    @ApiModelProperty(value = "计量单位")
    private String measurementUnit;