提交代码

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

@@ -10,12 +10,9 @@ import {OrderKListComponent} from './order-k-list/order-k-list.component';
 import {OrderHListComponent} from './order-h-list/order-h-list.component';
 import {OrderAgentComponent} from './order-agent/order-agent.component';
 import {PreOrderComponent} from './pre-order/pre-order.component';
-<<<<<<< HEAD
 import {PackageRecordListComponent} from './package-record-list/package-record-list.component';
 import {DiscountUseConditionListComponent} from './discount-use-condition-list/discount-use-condition-list.component';
-=======
 import {DicountPackageOrderListComponent} from './dicount-package-order-list/dicount-package-order-list.component';
->>>>>>> a9b4eaf54ddd85df8da4868c8de4a63783d5eaf6
 
 
 const routes: Routes = [
@@ -29,12 +26,9 @@ const routes: Routes = [
   { path: 'order-h-list', component: OrderHListComponent },
   { path: 'order-agent', component: OrderAgentComponent },
   { path: 'pre-order', component: PreOrderComponent },
-<<<<<<< HEAD
   { path: 'package-record-list', component: PackageRecordListComponent },
   { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent },
-=======
   { path: 'discount-package-order-list', component: DicountPackageOrderListComponent},
->>>>>>> a9b4eaf54ddd85df8da4868c8de4a63783d5eaf6
 ];
 
 @NgModule({

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

@@ -21,19 +21,21 @@ import { PreOrderComponent } from './pre-order/pre-order.component';
 import { PackageRecordListComponent } from './package-record-list/package-record-list.component';
 import { DiscountUseConditionListComponent } from './discount-use-condition-list/discount-use-condition-list.component';
 import {DicountPackageOrderListComponent} from "./dicount-package-order-list/dicount-package-order-list.component";
+import {NzSpaceModule} from "_ng-zorro-antd@9.3.0@ng-zorro-antd/space";
 
 @NgModule({
   declarations: [OrderListComponent, OrderDetailComponent, OrderCouponsComponent, OrderCouponComponent , OrderTListComponent, OrderKListComponent , OrderCListComponent, OrderHListComponent, OrderAgentComponent, PreOrderComponent, PackageRecordListComponent, DiscountUseConditionListComponent, DicountPackageOrderListComponent],
-  imports: [
-    CommonModule,
-    OrderRoutingModule,
-    NgZorroAntdModule,
-    SeparateModule,
-    ReactiveFormsModule,
-    FormsModule,
-    BreadcrumbModule,
-    RegionSelectorModule,
-    AppCommonModule
-  ]
+    imports: [
+        CommonModule,
+        OrderRoutingModule,
+        NgZorroAntdModule,
+        SeparateModule,
+        ReactiveFormsModule,
+        FormsModule,
+        BreadcrumbModule,
+        RegionSelectorModule,
+        AppCommonModule,
+        NzSpaceModule
+    ]
 })
 export class OrderModule { }