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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

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

}