Merge branch 'feature_asset'

mitao

3 天以前 f409bb23163dfa6c3f0508f6b90a1caacc7b9518

 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;


}