Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-07-07 1e6dbe352c35a54c299008c523e38b1e59d1ea03

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

@@ -30,6 +30,14 @@

    List<ManageMenu> getDataWithPage(Map map);

    List<ManageMenu> getAll();

    List<ManageMenu> getManageRoleByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByCondition(Map map);

    List<ManageMenu> getManageMenuByRoleId(int roleId);

}