fix：

.gitignore

@@ -1,11 +1,7 @@
 .DS_Store
 node_modules
-<<<<<<< HEAD
 
 
-=======
-/dist
->>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
 # local env files
 .env.local
 .env.*.local

src/views/index/components/communication/index.vue

@@ -1,13 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 14:10:08
-<<<<<<< HEAD
  * @LastEditors: WangQiBiao
- * @LastEditTime: 2019-10-16 07:05:00
-=======
- * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-13 16:56:30
->>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
+ * @LastEditTime: 2019-10-16 08:56:44
  * @Description: 在线沟通
  -->
 <template>

src/views/index/components/entrance-guard/index.vue

@@ -1,13 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 10:20:36
-<<<<<<< HEAD
  * @LastEditors: WangQiBiao
- * @LastEditTime: 2019-10-13 14:35:26
-=======
- * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-13 16:51:49
->>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
+ * @LastEditTime: 2019-10-16 08:56:48
  * @Description: 智能门禁
  -->
 <template>