fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -24,4 +24,7 @@
    @NotBlank(message = "租户id不可为空")
    @ApiModelProperty(value = "租户id")
    private String tenantId;
    @ApiModelProperty(value = "查询多个状态")
    private List<Integer> statuses;

}