Merge remote-tracking branch 'origin/master'

沈斌

2018-07-13 7f93b01660cae23d38e9fa8083fe24a952b7ef4c

 src/environments/environment.prod.ts

@@ -4,5 +4,5 @@
    production: true,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL:`http://47.96.15.25:8080/screen_api_v2/`
    SERVER_BASH_URL: `http://monitor-api2.7drlb.com/`
};