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

fengxiang

2018-03-14 2b76c020b627ed5cba7e1e0b33b49410e45dc8a6

 src/environments/environment.prod.ts

@@ -4,5 +4,5 @@
    production: true,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL:`http://172.16.206.8:8080/screen_api_v2/`
    SERVER_BASH_URL:`http://47.96.15.25:8080/screen_api_v2/`
};