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

徐旺旺

2021-03-29 6ab6b11a0ba0bc20c099b9f7b73e9d03fe7d5b8e

 src/Sgis.js

@@ -16,6 +16,7 @@
import './components/plugin/Editable' // 标绘操作
import './components/plugin/MagicMarker' // 动画Marker
import './assets/css/map/magic.min.css' // 动画Marker css
import '@/components/plugin/magicMarker.css'
import '@components/plugin/pulse/Pulse' // marker 外圈波
import '@components/plugin/pulse/Pulse.css' // marker 外圈波 css