Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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