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

chenyabin

2021-05-14 2cbc4c3ce921f22ae2fd498098d46dbda06c0452

 src/components/plugin/MagicMarker.js

@@ -9,7 +9,7 @@
  }
  L.Icon.Magic = function (options) {
    let opts
    console.log(options)
    // console.log(options)
    if (options.iconUrl) {
      opts = {
        html: '<div class=\'magicDiv\'><div class=\'magictime ' + options.magic + '\'>' + options.html + '</div></div>'