fix: merge

travel-platform-web/travel-web/src/crm/mobile/nav-mobile-menu/nav-mobile-menu.scss

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /* src/app/modules/travel/web/components/nav-web-menu/nav-web-menu.component.css */
 
 /* 基础样式 */
@@ -111,39 +110,4 @@
   max-width: 1200px;
   margin: 20px auto;
   padding: 0 20px;
-=======
-.mobile-container {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  
-  .router-outlet {
-    flex: 1;
-    overflow-y: auto;
-  }
-  
-  .bottom-nav {
-    display: flex;
-    justify-content: space-around;
-    background: white;
-    box-shadow: 0 -2px 5px rgba(0,0,0,0.1);
-    
-    a {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding: 8px 0;
-      text-decoration: none;
-      color: #666;
-      
-      mat-icon {
-        margin-bottom: 4px;
-      }
-      
-      &.active {
-        color: #3f51b5;
-      }
-    }
-  }
->>>>>>> f1142160250d8bf637a34bae4ae042876af1ec90
 }