fix:更新

src/main.ts

@@ -32,7 +32,6 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
   app.component(key, component)
 }
 // 添加 Element Plus
-
 app.use(FloatingVue, {
   distance: 12,
 })

src/views/login.vue

@@ -160,4 +160,8 @@
     opacity: 0;
   }
   </style>
+<<<<<<< HEAD
   
+=======
+  
+>>>>>>> 42d928175ed879069f8c0c2bb997b6902b8bc18b