Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 030201887b4690e20b1f9ffae548ccd840e7077f

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

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

    @ApiModelProperty(value = "数量")
    private BigDecimal quantity;
    private Integer quantity;

    @ApiModelProperty(value = "单价")
    private BigDecimal unitPrice;