解决冲突
This commit is contained in:
		@ -4,12 +4,13 @@
 | 
			
		||||
 * @Author       : Shiming
 | 
			
		||||
 * @Date         : 2022-01-06 09:24:00
 | 
			
		||||
 * @LastEditors  : Shiming
 | 
			
		||||
 * @LastEditTime : 2022-02-10 11:34:03
 | 
			
		||||
 * @LastEditTime : 2022-04-07 09:43:47
 | 
			
		||||
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts
 | 
			
		||||
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 | 
			
		||||
 */
 | 
			
		||||
import { NgModule } from '@angular/core';
 | 
			
		||||
import { RouterModule, Routes } from '@angular/router';
 | 
			
		||||
import { OrderManagementAbnormalWarningComponent } from './components/abnormal-warning/abnormal-warning.component';
 | 
			
		||||
import { OrderManagementBulkDetailChangeComponent } from './components/bulk-detail-change/bulk-detail-change.component';
 | 
			
		||||
import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component';
 | 
			
		||||
import { OrderManagementBulkComponent } from './components/bulk/bulk.component';
 | 
			
		||||
@ -36,6 +37,7 @@ const routes: Routes = [
 | 
			
		||||
  { path: 'complaint-detail/:id', component: OrderManagementComplaintDetailComponent },
 | 
			
		||||
  { path: 'receipts-audit', component: OrderManagementReceiptsAuditComponent },
 | 
			
		||||
  { path: 'compliance-audit', component: OrderManagementComplianceAuditComponent },
 | 
			
		||||
  { path: 'abnormal-warning', component: OrderManagementAbnormalWarningComponent },
 | 
			
		||||
]
 | 
			
		||||
@NgModule({
 | 
			
		||||
  imports: [RouterModule.forChild(routes)],
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user