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

cjl

2023-07-10 315ec391b2a36a6d796a8726b57b7c2b8908db12

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

@@ -20,4 +20,10 @@
    void insertBatch(@Param("list")List<Map> list);

    void updateDeleteStateByMenu_id(Map map);

    List<Map> getDataByMenuIds(@Param("list")List list,@Param("role_id")int role_id);

    List<Map> getDataByRoleId(int role_id);

    void updateDeleteStateByRoleIdMenuIds(@Param("list")List list,@Param("role_id")int role_id);
}