fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/query/THouseQuery.java

@@ -16,6 +16,6 @@
    private String propertyRightPerson;

    @ApiModelProperty(value = "租赁状态 1=待出租 2=已出租 3=维修中")
    private Integer leaseStatus;
    private String leaseStatus;

}