Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 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);