Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-01 65007f6811e580d8660340b8216296e68fae598c

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