Merge remote-tracking branch 'origin/master'

mitao

2 天以前 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b

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

@@ -84,7 +84,7 @@

    @ApiModelProperty(value = "是否抵押：0-否，1-是")
    @TableField("is_mortgaged")
    private Boolean isMortgaged;
    private Integer mortgaged;

    @ApiModelProperty(value = "承租方")
    @TableField("tenant_name")