From af0aaf0fe19dc69369ee2f7e5ca001c24353a22e Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 17:22:52 +0800
Subject: [PATCH] 冲突

---
 public/index.html |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/public/index.html b/public/index.html
index f77ca95..1f0a7d0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -18,6 +18,7 @@
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.8.12/index.css">
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
+  <script src="./geo.js"></script>
   <link rel="icon" href="<%= BASE_URL %>favicon.png">
   <!-- <title>保安监管系统</title> -->
   <title>智慧保安监管模块</title>
@@ -121,4 +122,4 @@
   <script src="<%= BASE_URL %>cdn/avue/2.8.12/avue.min.js" charset="utf-8"></script>
 </body>
 
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.3