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

cjl

2023-08-23 5f7d27060aeca3f23737db21e06fc07c8e28f1a8

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

}