From 9351d47948e1421f308eac1fa761b18b621580a9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 14:10:53 +0800
Subject: [PATCH] fix 修复 合并错误
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 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 164a697..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
@@ -39,7 +39,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
- List<Integer> selectRoleListByUserId(Long userId);
+ List<Long> selectRoleListByUserId(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
--
Gitblit v1.9.3