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

chenyabin

2021-04-02 724f7ffe496cca442d73b5bd39d9949178974032

 src/components/LayerController/logic/SolidWaste.js

@@ -43,12 +43,12 @@
          iconAnchor: [25, 25]
        })
      })
      marker.bindTooltip(getSolidWasteData[i].Name, {
      /*  marker.bindTooltip(getSolidWasteData[i].Name, {
        permanent: true,
        offset: [0, 14],
        direction: 'bottom',
        className: 'company-bindTooltip'
      })
      }) */
      layer.addLayer(marker)
    }
  }