Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2026-04-23 a228c5f91173c50ce7f94255dc9a25a7c6703e0c

 src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java

@@ -1,6 +1,8 @@
package com.ruoyi.project.system.mapper;



import java.util.List;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.ruoyi.project.system.domain.SysRole;



/**

@@ -39,7 +41,7 @@
     * @param userId 用户ID

     * @return 选中角色ID列表

     */

    public List<Integer> selectRoleListByUserId(Long userId);

    public List<Long> selectRoleListByUserId(Long userId);



    /**

     * 通过角色ID查询角色