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

疯狂的狮子Li

2021-11-28 a627de02c750f6af4c524aff75d28343226f2a82

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -58,6 +58,6 @@
     * @param menuCheckStrictly 菜单树选择项是否关联显示
     * @return 选中菜单列表
     */
    List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
    List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);

}