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

fengxiang

2018-01-05 2d4cbcc4f92edbc4f926d9710bdda64520039c2b

 src/environments/environment.prod.ts

@@ -3,5 +3,5 @@
    production: true,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL: 'http://47.96.171.62:8080/screen_api_v2'
    SERVER_BASH_URL: 'http://localhost:8080'
};