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

chenzeping

2021-03-16 d09b02072091a96fbe1bd426b1db4cae691212fc

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

# Conflicts:
#	src/components/panel/ToolBoxPanel.vue

 src/conf/TDT.js

@@ -183,7 +183,7 @@
      visible: false,
      layerType: 'cta_c',
      isLoadMapByToken: true,
      url: TIANDITU_GIS_HOST + '/cta_c/wmts?layer=cva&style=default&tilematrixset=c' +
      url: TIANDITU_GIS_HOST + '/cta_c/wmts?layer=cta&style=default&tilematrixset=c' +
        '&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}' +
        '&tk=' + TIANDITU_GIS_TOKEN,
      option: {