From 183f436c553b641770fdb2352452192c97009a84 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Mon, 01 Mar 2021 16:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index 84d3e23..3c0c6dc 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,8 +1,8 @@
-// var my_api_server_url = 'http://127.0.0.1:8888/';
+ var my_api_server_url = 'http://127.0.0.1:8888/';
 // var my_api_server_url = 'http://192.168.2.240:8888/';
-//var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
- // var my_api_server_url = 'zuul.kidgrow.cloud/';
-var my_api_server_url = 'https://zuul.kidgrow.cloud/';
+// var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
+//  var my_api_server_url = 'https://zuul.kidgrow.cloud/';
+//var my_api_server_url = 'https://zuul.kidgrow.cloud/';
 
 if(my_api_server_url.indexOf("http")<0)
 {

--
Gitblit v1.8.0