From b703a369699131e71b72069f458e74b8fff1e0ab Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Mon, 6 May 2024 16:21:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/goods/goods-type/goods-type.component.ts | 2 --
 src/app/pages/merchant/mer-list/mer-list.component.ts  | 7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/goods/goods-type/goods-type.component.ts b/src/app/pages/goods/goods-type/goods-type.component.ts
index 95c16f6..64f3766 100644
--- a/src/app/pages/goods/goods-type/goods-type.component.ts
+++ b/src/app/pages/goods/goods-type/goods-type.component.ts
@@ -4,8 +4,6 @@ import {NzButtonComponent} from "ng-zorro-antd/button";
 import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
 import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
 import {NzInputDirective} from "ng-zorro-antd/input";
-import {RoleService} from "../../../servies/role/role.service";
-import {MenuService} from "../../../servies/menu/menu.service";
 import {NzMessageService} from "ng-zorro-antd/message";
 import {NzModalService} from "ng-zorro-antd/modal";
 import {NgForOf} from "@angular/common";
diff --git a/src/app/pages/merchant/mer-list/mer-list.component.ts b/src/app/pages/merchant/mer-list/mer-list.component.ts
index 00eeabf..cb2e64f 100644
--- a/src/app/pages/merchant/mer-list/mer-list.component.ts
+++ b/src/app/pages/merchant/mer-list/mer-list.component.ts
@@ -18,17 +18,16 @@ import {NzIconDirective} from "ng-zorro-antd/icon";
 import {NzInputDirective} from "ng-zorro-antd/input";
 import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu";
 import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
-import {SysAccountService} from "../../../servies/account/sys-account.service";
-import {RoleService} from "../../../servies/role/role.service";
 import {NzMessageService} from "ng-zorro-antd/message";
 import {NzModalModule, NzModalService} from "ng-zorro-antd/modal";
-import {MerService} from "../../../servies/merchant/mer.service";
 import {NzFlexDirective} from "ng-zorro-antd/flex";
 import {NzDescriptionsModule} from "ng-zorro-antd/descriptions";
 import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload";
 import {environment} from "../../../../environments/environment";
 import {Observable, Observer} from "rxjs";
-import {NzAvatarComponent, NzAvatarModule} from "ng-zorro-antd/avatar";
+import {NzAvatarModule} from "ng-zorro-antd/avatar";
+import {MerService} from "../../../services/merchant/mer.service";
+import {RoleService} from "../../../services/role/role.service";
 
 @Component({
   selector: 'app-mer-list',