From e6fc35920ded81df2642ad4b79a74ab3092d449f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 一月 2025 11:51:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java
index 883c195..0357962 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java
@@ -4,6 +4,7 @@
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TTenant;
 import com.ruoyi.system.query.TTenantQuery;
+import com.ruoyi.system.vo.TenantVO;
 
 /**
  * <p>
@@ -20,5 +21,5 @@
      * @param query
      * @return
      */
-    PageInfo<TTenant> pageList(TTenantQuery query);
+    PageInfo<TenantVO> pageList(TTenantQuery query);
 }

--
Gitblit v1.7.1