fix：解决冲突

2024-12-16 17:39:47 +08:00
parent 0c148685d2 897d91a9c6
commit 111133ffb4
40 changed files with 1905 additions and 17 deletions
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,6 +1,6 @@
 <template>
  <main class="wrapper">
-    <box1 />
+    <!-- <box1 /> -->
    <div class="header">
      <ul class="nav-left">
        <li class="nav-left-item">安全</li>