From 17bed3a7f7e90b23afb5def223fd7a285ff6cc24 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 08:40:56 +0800
Subject: [PATCH] 冲突

---
 public/map/widgets/securityMap/SecurityMap.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/public/map/widgets/securityMap/SecurityMap.js b/public/map/widgets/securityMap/SecurityMap.js
index c93be8b..ae7aec9 100644
--- a/public/map/widgets/securityMap/SecurityMap.js
+++ b/public/map/widgets/securityMap/SecurityMap.js
@@ -161,7 +161,7 @@
 
         //基础路径
         //pathUrl: "http://localhost:89",
-        pathUrl: "http://s16s652780.51mypc.cn/api/blade-jfpts",
+        pathUrl: "http://223.82.109.183:2082/api/blade-jfpts",
 
         // 电子围栏需要新增的Id
         newElectronicFenceId: null,

--
Gitblit v1.9.3