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

maven

昨天 1cf92e13371b55c4449ccb48b264eea547eccb86

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