feat(*): 修复冲突

f1941749 · Cai Wei · 7c868484 · f1941749
Commit f1941749 authored May 26, 2025 by Cai Wei
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 12 deletions

menuCom.vue src/layout/menuCom.vue +0 -12

No files found.
--- a/src/layout/menuCom.vue
+++ b/src/layout/menuCom.vue
@@ -101,18 +101,6 @@ const getMenuTitle = (item) => {
    width: 16px;
    // height: 18px;
    margin-right: 5px;
-<<<<<<< HEAD
-=======
-  }
-}
-
-
-.is-active {
-  color: #fff !important;
-  background: #03a1b3 !important;
-  span {
-    color: #fff !important;
->>>>>>> 1ad6a24f7b192e495e1c4235e6fd952843486a6c
  }
 }