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

fengxiang

2018-08-03 e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef

 src/app/core/core.module.ts

@@ -1,7 +1,7 @@
import { NgModule, Optional, SkipSelf } from '@angular/core';
import { throwIfAlreadyLoaded } from './module-import-guard';
import { throwIfAlreadyLoaded } from '@core/module-import-guard';

import { I18NService } from './i18n/i18n.service';
import { I18NService } from '@core/i18n/i18n.service';

@NgModule({
    providers: [