Merge branch 'feature_asset'

mitao

2 天以前 ab0ad84b5c577036f9ed5b53d2e90e81e5ba3de9

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

@@ -66,7 +66,7 @@

    @ApiModelProperty(value = "是否删除 0-否，1-是")
    @TableField("disabled")
    private Boolean disabled;
    private Integer disabled;


}