Merge remote-tracking branch 'origin/master'

mitao

2 天以前 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

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

@@ -82,9 +82,9 @@
    @TableField("resettlement_situation")
    private String resettlementSituation;

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

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