Merge branch 'master' of https://git.kaiyili-lab.com/huangsucan/IOT_WEB

# Conflicts: # dist/index.html
2026-08-21 16:50:34 +08:00
parent 3f4030c9e8 ef029340f2
commit cbf599d46f
6 changed files with 60 additions and 0 deletions
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 <html lang="zh-CN">
  <head>
@@ -13,3 +14,21 @@
    <!-- Vite 入口，指向 src/main.js，不要删除 -->␍
  </body>
 </html>
+=======
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Element Plus Demo</title>
+    <script type="module" crossorigin src="/assets/index.a712a2e4.js"></script>
+    <link rel="modulepreload" href="/assets/vendor.3763ac43.js">
+    <link rel="stylesheet" href="/assets/index.a7868d2c.css">
+  </head>
+  <body>
+    <div id="app"></div>
+    <!-- 引入 Vite 的核心模块入口 -->
+    
+  </body>
+</html>
+>>>>>>> ef029340f2f8ddaab8f06229c6a867fadacd9a3c