解决冲突

This commit is contained in:
wangshiming
2022-04-27 13:45:00 +08:00
parent f0afe10ec1
commit 5a429bafdf
11 changed files with 61 additions and 77 deletions

View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-09 14:34:55
* @LastEditors : Shiming
* @LastEditTime : 2022-04-20 15:45:20
* @LastEditTime : 2022-04-27 11:28:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -63,7 +63,6 @@ import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/
import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
import { ParterRebateManageMentAddPartnerListComponent } from './rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component';
import { ChannelLogModalComponent } from './partner-list/components/channel-log-modal/channel-log-modal.component';
import { PartnerSystemConfigComponent } from './system-config/components/config/config.component';
const COMPONENTS: any[] = [
PartnerBusinessStatisticsIndexComponent,
@ -117,7 +116,6 @@ const COMPONENTS: any[] = [
ParterAdviceFeedbackDetailComponent,
ParterRebateManageMentAddPartnerListComponent,
ChannelLogModalComponent,
PartnerSystemConfigComponent
];
@NgModule({