From a438a004d92586c0657ef5c5d297b1af88ea370d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sat, 10 Oct 2020 15:12:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js |    9 +++------
 1 files changed, 3 insertions(+), 6 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 c7c9be5..5903ff8 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,9 +1,6 @@
-// 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/';
 // 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 = 'http://uat.zuul.kidgrow.cloud/';
+//var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
+ var my_api_server_url = 'http://zuul.kidgrow.cloud/';
 // var my_api_server_url = 'https://zuul.kidgrow.cloud/';
-//var my_api_server_url = 'http://123.57.164.62:8888/';
 

--
Gitblit v1.8.0