fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/service/THouseService.java

@@ -1,7 +1,11 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.THouse;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.query.THouseQuery;
import com.ruoyi.system.query.TUserHistoryQuery;
import com.ruoyi.system.vo.HouseVO;

/**
 * <p>
@@ -13,4 +17,7 @@
 */
public interface THouseService extends IService<THouse> {

    PageInfo<THouse> houseList(THouseQuery query);

    PageInfo<HouseVO> userHistoryList(TUserHistoryQuery query);
}