Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 acbe0c6c601ff1368002d701631a43a2c00b61f5

 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;