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

jinpengyong

2023-11-01 87172c08a55e972ff850ab3542858d11d66505ca

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