Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 053c2264ab5d7596aea3f8fcac18d487e6f9c766

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorageAsset.java

@@ -64,7 +64,7 @@
    private String measurementUnit;

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

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