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

fengxiang

2017-12-20 3963396bffa74454217500f5d56552a352968b40

 src/environments/environment.ts

@@ -4,5 +4,9 @@
// The list of which env maps to which file can be found in `.angular-cli.json`.

export const environment = {
  production: false
    SERVER_URL: `./`,
    production: false,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL: 'http://localhost:8001'
};