Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/mapper/MenuMapper.java

@@ -20,8 +20,6 @@

    List<Menu> getParentMenuList(@Param("menuName") String menuName);

    List<Integer> getChannelId();

    List<Menu> getMenuListInfo();

    List<Integer> getMenuOrdersByRoleId(@Param("roleId") Integer roleId);