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

fengxiang

2018-05-28 f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e

 src/environments/environment.prod.ts

@@ -3,5 +3,6 @@
    SERVER_URL: `./`,
    production: true,
    hmr: false,
    useHash: true
    useHash: true,
    SERVER_BASH_URL:`http://47.96.15.25:8080/screen_api_v2/`
};