From 21e0bc31710f67f9e383b2f379eb40ff0144e4f4 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Tue, 07 Apr 2020 15:43:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js |    4 ++--
 1 files changed, 2 insertions(+), 2 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 f28f115..953b73e 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,4 +1,4 @@
-var my_api_server_url = 'http://zuul.kidgrow.com/';
+// var my_api_server_url = 'http://zuul.kidgrow.com/';
 // var my_api_server_url = 'http://192.168.2.240:8888/';
-// var my_api_server_url = 'http://127.0.0.1:8888/';
+var my_api_server_url = 'http://127.0.0.1:8888/';
 

--
Gitblit v1.8.0