From b606905fcaf748edfc4bafb236e388f3295f2899 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 四月 2025 09:16:46 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
index f9d697f..3ff9bba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
@@ -77,8 +78,7 @@
@ApiOperation(value = "获取房屋分页列表")
@PostMapping(value = "/houseList")
@PreAuthorize("@ss.hasPermi('house:list')")
-
- public R<PageInfo<THouse>> houseList(@RequestBody THouseQuery query) {
+ public R<IPage<THouse>> houseList(@RequestBody THouseQuery query) {
return R.ok(tHouseService.houseList(query));
}
@ApiOperation(value = "历史租户列表")
--
Gitblit v1.7.1