Merge remote-tracking branch 'origin/master'

沈斌

2018-07-13 ba218bd17ed9b3bf1f330294714850a09ac71c17

 src/environments/environment.ts

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