Merge branch 'develop-3'

This commit is contained in:
zhouyuejun
2018-12-14 09:46:05 +08:00
61 changed files with 3161 additions and 3186 deletions
-2
View File
@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NgZorroAntdModule } from 'ng-zorro-antd'
import { PipesModule } from '../../pipes/pipes.module';
import { MainComponent } from './main.component';
import { MainRoutingModule } from './main-routing.module';
import { RelatedTabComponent } from './related-tab/related-tab.component';
@@ -18,7 +17,6 @@ import { SpecialTabComponent } from './special-tab/special-tab.component';
FormsModule,
ReactiveFormsModule,
NgZorroAntdModule,
PipesModule,
MainRoutingModule
],
declarations: [