From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/THouseService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/THouseService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/THouseService.java
index a0850f5..c68346c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/THouseService.java
+++ b/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);
}
--
Gitblit v1.7.1