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

# Conflicts: # packages/2.0.5/AppGridMap/components/list.vue
2021-12-22 17:08:32 +08:00
parent 302674273a f9cfba00bc
commit c2dd5e8d29
20 changed files with 372 additions and 117 deletions
--- a/packages/2.0.5/AppGridMap/components/list.vue
+++ b/packages/2.0.5/AppGridMap/components/list.vue
@@ -3,7 +3,7 @@
    <ai-map :map.sync="map" :lib.sync="mapLib"/>
    <div class="drawer" ref="drawer">
      <div v-if="show" class="drawer-content">
-        <b>网格管理</b>
+        <b>网格地图</b>
        <div class="tree">
          <div class="input">
            <el-input