From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
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