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

fengxiang

2018-08-03 e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef

 src/main.ts

@@ -1,10 +1,10 @@
import { enableProdMode, ViewEncapsulation } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
import { AppModule } from 'app/app.module';
import { environment } from '@env/environment';

import { hmrBootstrap } from './hmr';
import { hmrBootstrap } from 'hmr';

import { preloaderFinished } from '@delon/theme';
preloaderFinished();