Merge remote-tracking branch 'origin/dev' into dev

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

 screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java

@@ -45,4 +45,8 @@

    void updateManageMenuById(Map map);

    List<ManageMenu> getDataWithPage(Map map);

    List<ManageMenu> getManageRoleByNameFuzzy(Map map);

}