Merge remote-tracking branch 'origin/master'

mitao

2 天以前 bdd967acce69d2420d9866789dfcee42c7e77023

 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;


}