Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-05-28 f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e

 src/environments/environment.ts

@@ -9,5 +9,5 @@
    production: false,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL: `http://127.0.0.1:8080/screen_api_v2/`
    SERVER_BASH_URL: `http://47.96.171.62:8080/screen_api_v2/`
};