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

cjl

2023-07-27 7e5452d35bb30dad5bc9e37360047b5a43732dcd

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

@@ -34,6 +34,8 @@

    List<ManageMenu> getManageRoleByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByCondition(Map map);

    List<ManageMenu> getManageMenuByRoleId(int roleId);