From 2df3f64bbacbf960e1d6b9b73893aeb0c01b7d1d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 06 三月 2026 14:37:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

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

diff --git a/src/main/java/com/ruoyi/projectManagement/service/RolesService.java b/src/main/java/com/ruoyi/projectManagement/service/RolesService.java
index 039a1d1..cc30753 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/RolesService.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/RolesService.java
@@ -3,7 +3,8 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.projectManagement.pojo.Roles;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 public interface RolesService extends IService<Roles> {
-    IPage<Roles> listPage(IPage<Roles> page, Roles roles);
+    IPage<Roles> listPage(Page<Roles> page, Roles roles);
 }

--
Gitblit v1.9.3