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

fengxiang

2018-05-15 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2

 src/environments/environment.prod.ts

@@ -1,7 +1,8 @@
export const environment = {
    chore: false,
    SERVER_URL: `./`,
    production: true,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL: 'http://localhost:8080'
    SERVER_BASH_URL:`http://47.96.15.25:8080/screen_api_v2/`
};