Merge branch 'feature_asset'

mitao

昨天 0146a1483a3368f75daa6eb03aa42c714943e6b2

 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;


}