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

chenyabin

2021-04-02 724f7ffe496cca442d73b5bd39d9949178974032

 src/components/LayerController/logic/SolidWaste.js

@@ -89,7 +89,7 @@
    const instance = new PublicBounced()
    instance.$mount()
    document.body.appendChild(instance.$el)
    instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
    instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
    /* flyTo()弹出框平移事件 */
    this.setPanTo(e.latlng, 200)
  }