解决冲突

This commit is contained in:
wangshiming
2022-04-27 15:58:29 +08:00
parent d2bb698692
commit 9cba8ef2d5
3 changed files with 6 additions and 9 deletions

View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:23:05
* @LastEditTime : 2022-04-27 11:28:48
* @LastEditTime : 2022-04-27 15:52:30
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
@ -38,7 +38,6 @@ import { OrganizationManagementComponent } from './components/organization-manag
import { OrganizationModalComponent } from './components/organization-management/organization-modal/organization-modal.component';
import { ApiAuthModalComponent } from './components/organization-management/api-auth-modal/api-auth-modal.component';
import { MenuTreeComponent } from './components/organization-management/menu-tree/menu-tree.component';
import { PartnerSystemConfigComponent } from './components/config/config.component';
const COMPONENTS = [
StaffManagementComponent,
@ -59,7 +58,6 @@ const COMPONENTS = [
NoTeManagementComponent,
SmsTemplateComponent,
OrganizationManagementComponent,
PartnerSystemConfigComponent
];
const NOTROUTECOMPONENTS = [
BuyerTranspowerComponent,