Merge branch 'master' into pim_zss

zss

2025-09-22 bc041bbe418b340af60fafd1c4e15463624e96e3

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

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

     * @return 选中角色ID列表

     */

    public List<Integer> selectRoleListByUserId(Long userId);

    public List<Long> selectRoleListByUserId(Long userId);



    /**

     * 通过角色ID查询角色