Merge branch 'dev' of https://gitee.com/ssssssss-team/magic-api into dev

# Conflicts:
#	magic-editor/src/console/src/components/editor/magic-script-editor.vue