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

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

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

@@ -34,6 +34,10 @@

    List<ManageMenu> getManageRoleByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByCondition(Map map);

    List<ManageMenu> getManageMenuByRoleId(int roleId);

}