Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-04-24 d3386ce4a4439ee740ca79d33ac7040963a18948

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js

@@ -1 +1,4 @@
var my_api_server_url = 'http://192.168.2.240:8888/';
// 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/';