Merge branch 'order' of http://139.159.177.244:3000/yuanye/high-web into order

* 'order' of http://139.159.177.244:3000/yuanye/high-web:
  提交代码

# Conflicts:
#	src/app/admin/order-manage/order-manage.module.ts

src/app/admin/order-manage/order-manage.module.ts

@@ -10,7 +10,7 @@ import {AppCommonModule} from '../../app-common.module';
 import { OrderCouponListComponent } from './order-coupon/order-coupon-list/order-coupon-list.component';
 import { OrderIntegralRechargeComponent } from './order-integral-recharge/order-integral-recharge.component';
 import { OrderRefundListComponent } from './order-refund-list/order-refund-list.component';
-import {KfcOrderListComponent} from "./kfc-order/kfc-order-list/kfc-order-list.component";
+import {KfcOrderListComponent} from './kfc-order/kfc-order-list/kfc-order-list.component';
 
 @NgModule({
   declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent],