Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-31 a2bd66a59a51c84100474d1ce3eb79d7ed3b754e

 src/environments/environment.hmr.ts

@@ -1,8 +1,8 @@
export const environment = {
    chore: false,
    SERVER_URL: `./`,
    production: false,
    production: true,
    hmr: true,
    useHash: true,
    SERVER_BASH_URL: `http://47.96.171.62:8080/screen_api_v2/`
    SERVER_BASH_URL: `http://monitor-api2.7drlb.com/`
};