From af0aaf0fe19dc69369ee2f7e5ca001c24353a22e Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 17:22:52 +0800
Subject: [PATCH] 冲突

---
 src/components/map/main.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/map/main.vue b/src/components/map/main.vue
index fd4c1f0..420ec71 100644
--- a/src/components/map/main.vue
+++ b/src/components/map/main.vue
@@ -94,7 +94,7 @@
     },
     mounted () {
         //建立地图
-        this.createmap(1); //1为本地
+        this.createmap(2); //1为本地
 
         this.parentParameter();
 

--
Gitblit v1.9.3