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

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

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

}