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

liyong

21 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

 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查询角色