Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

jinpengyong

2021-04-14 cdf57ef11128f7df6f216c1c717ac783c625fa1b

 screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java

@@ -32,7 +32,7 @@

    List<ManageMenu> getAllMenus();

    List<ManageMenu> getManageMenuByRoleId(int roleId);
    List getManageMenuByRoleId(int roleId);

    List<ManageMenu> getManageMenuByNameFuzzy(Map map);