Merge branch 'order' into 2.0-dev

* order:
  提交代码

# Conflicts:
#	src/app/admin/index/index.module.ts

src/app/admin/index/index-routing.module.ts

@@ -2,13 +2,11 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import {IndexComponent} from './index/index.component';
 import {TestComponent} from './test/test.component';
-import {OrderStatisticsComponent} from './order-statistics/order-statistics.component';
 
 
 const routes: Routes = [
   { path: '', component: IndexComponent },
   { path: 'test', component: TestComponent },
-  { path: 'order-statistics', component: OrderStatisticsComponent }
 ];
 
 @NgModule({