Merge remote-tracking branch 'origin/master'

xuhy

昨天 206fcf7d6afae27856f63cf0158f53b61fa1b86f

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

@@ -132,4 +132,6 @@

    List<SysMenu> selectList();

    List<SysMenu> selectListByRoleType(@Param("roleType")Integer roleType);

}