From 2ef19aff2a07ec697c1f1c672fbb2bf82cafacc0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 17 Aug 2024 18:21:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/public/index.html | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gz-customerSystem/public/index.html b/gz-customerSystem/public/index.html
index a68910f..ec0ecf8 100644
--- a/gz-customerSystem/public/index.html
+++ b/gz-customerSystem/public/index.html
@@ -2,8 +2,8 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-18 14:58:23
- * @LastEditTime: 2023-05-12 19:19:14
- * @LastEditors: lwh
+ * @LastEditTime: 2024-08-17 11:55:06
+ * @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description:
-->
@@ -34,6 +34,7 @@
<title>白云区矛盾纠纷多元化解平台</title>
<script type="text/javascript" src="http://120.79.193.119:8000/pageoffice/pageoffice.js"></script>
<script type="text/javascript" src="./locationSelect.js"></script>
+ <script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=13i28TcWWSbyYIqjHaJceqQbZa1dFlOt"></script>
<script>
window.onload = () => {
document.getElementById('loader-wrapper').remove();
--
Gitblit v1.8.0