From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
index 972f8f6..eb44006 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -10,7 +10,7 @@
/**
* 瑙掕壊琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
public interface SysRoleMapper extends BaseMapperPlus<SysRole> {
@@ -22,7 +22,7 @@
* @param role 瑙掕壊淇℃伅
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
- public List<SysRole> selectRoleList(SysRole role);
+ List<SysRole> selectRoleList(SysRole role);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
@@ -30,7 +30,7 @@
* @param userId 鐢ㄦ埛ID
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRolePermissionByUserId(Long userId);
+ List<SysRole> selectRolePermissionByUserId(Long userId);
/**
@@ -39,7 +39,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
- public List<Integer> selectRoleListByUserId(Long userId);
+ List<Long> selectRoleListByUserId(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
@@ -47,6 +47,6 @@
* @param userName 鐢ㄦ埛鍚�
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRolesByUserName(String userName);
+ List<SysRole> selectRolesByUserName(String userName);
}
--
Gitblit v1.9.3