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

fengxiang

2018-07-16 09d02da80ec5bd59836427007169fdd03738e393

 src/environments/environment.ts

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

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