From c43705775bba112ba31a4f8df4e7cfadaf4e2b07 Mon Sep 17 00:00:00 2001
From: "lj7788@126.com" <lj7788@126.com>
Date: Sun, 15 Jun 2025 16:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-bigscreen/src/components/header.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue
index 2a8060ca..d276679d 100644
--- a/yanzhu-bigscreen/src/components/header.vue
+++ b/yanzhu-bigscreen/src/components/header.vue
@@ -244,15 +244,9 @@ export default {
           break;
         case 6:
           this.$router.push("/greenCarbon");
-<<<<<<< HEAD
           break;  
         case 702:
           this.$router.push("/bimRoaming");
-=======
-          break;
-        case 701:
-          this.$router.push("/bimManage");
->>>>>>> origin/dev_xd
           break;
         case 102:
           this.$router.push("/labor");