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

徐旺旺

2021-04-18 e25ff993695e7a4b394a5d1aa102f113dbe5316b

 src/components/LayerController/logic/WasteSolid.js

@@ -74,7 +74,7 @@
    /* flyTo()弹出框平移事件 */
    this.setPanTo(e.latlng, 300)

    console.log(e.layer.options.totransferData.StoragePlaceId)
    // console.log(e.layer.options.totransferData.StoragePlaceId)
    window.$layer.open({
      content: {
        content: WasteSolidIndex, // 组件