Merge remote-tracking branch 'origin/master'

mitao

4 天以前 652db871507244a5838fc6b36d9b9771b527ad61

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

@@ -76,7 +76,7 @@

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

    @ApiModelProperty(value = "单价")
    @TableField("unit_price")