Merge remote-tracking branch 'origin/master'

mitao

4 天以前 325c6107782d4a2284bb24be688e7a87462dc202

 ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStoragePropertyDTO.java

@@ -139,8 +139,8 @@
        @ApiModelProperty(value = "安置情况")
        private String resettlementSituation;

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

        @ApiModelProperty(value = "承租方")
        private String tenantName;