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

fengxiang

2018-03-23 cb370be00fe6b23a8e13cbbd75c66bab9fed50c9

 src/environments/environment.prod.ts

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