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

houruijun

2020-06-15 8190823a593d3123384d3a75774ad19ecea07204

1
2
3
// 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/';