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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 screen-manage/src/main/resources/mapper/ManageMenuMapper.xml

@@ -32,7 +32,7 @@
        join
        manage_role_menu mrm
        on
        mm.`id` = mrm.`menu_id` and mrm.`is_delete`=0
        mm.`id` = mrm.`menu_id` and mrm.`is_delete`= '0'
        join
        manage_role mr
        on
@@ -41,7 +41,7 @@
            #{role.id}
        </foreach>
        where
        mm.`is_delete`=0
        mm.`is_delete`= '0'
    </select>

    <select id="getManageMenuByName" resultMap="BaseResultMap">