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/ISysRoleService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index 0263262..063e8a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -223,7 +223,7 @@
void saveRole(SysRoleDTO dto);
- PageInfo<SysRole> selectList(SysRoleQuery query);
+ PageInfo<SysRole> selectPageList(SysRoleQuery query);
/**
* 修改保存角色信息
@@ -232,4 +232,6 @@
* @return 结果
*/
public int editRole(SysRoleDTO dto);
+
+ List<SysRole> selectRoleByUserIds(List<String> roleIds);
}
--
Gitblit v1.7.1