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

cjl

2023-07-06 4434ac67c79a51525b57f4b2020d24678a2b3f73

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

@@ -12,4 +12,10 @@
                    <result column="is_delete" property="isDelete" />
        </resultMap>

    <update id="updateDeleteStateByRole_id" parameterType="java.util.Map">
        update manage_account_role
        set is_delete = 1
        where role_id = #{role_id}
    </update>

</mapper>