From 471191d2598f52743cbd86df922dd96ceeb680e3 Mon Sep 17 00:00:00 2001
From: Luck-Xiaomi <1569717859@qq.com>
Date: Fri, 9 Sep 2022 11:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectAdmin/zjsj/index.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/views/projectAdmin/zjsj/index.vue b/src/views/projectAdmin/zjsj/index.vue
index 068c36bd..201f33a5 100644
--- a/src/views/projectAdmin/zjsj/index.vue
+++ b/src/views/projectAdmin/zjsj/index.vue
@@ -8,19 +8,12 @@
             <div class="time">15:32:39</div>
             <div class="week">星期二</div>
           </div>
-<<<<<<< HEAD
-          <div class="title">中建四局数字建造平台</div>
-          <div class="between">
-            <div class="company"></div>
-            <div class="exit" @click="$router.push('/projectIndex')"></div>
-=======
           <div class="weather-date">
             <div class="weather">多云 32℃</div>
             <div class="date">2022-09-09</div>
->>>>>>> dev-xiaomi
           </div>
         </div>
-        <div class="title">中建四局数字建造管控平台</div>
+        <div class="title">中建四局数字建造平台</div>
         <div class="between">
           <div class="company"></div>
           <div class="exit" @click="$router.push('/projectIndex')"></div>