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

cjl

2023-07-07 7029a780a1738bffdb6b00fa94d7b845f9444a5d

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

@@ -34,4 +34,10 @@

    List<ManageMenu> getManageRoleByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByCondition(Map map);

    List<ManageMenu> getManageMenuByRoleId(int roleId);

}