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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

1
2
3
4
5
// 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://uat-zuul.kidgrow.cloud/';
//var my_api_server_url = 'http://123.57.164.62:8888/';