Merge remote-tracking branch 'origin/master'

沈斌

2018-07-13 7f93b01660cae23d38e9fa8083fe24a952b7ef4c

 src/environments/environment.hmr.ts

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