From 33966d0f661c0223f42a9891c2e48e4b2f54e3d8 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Mon, 6 Mar 2023 16:48:19 +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/admin/api-merchants/list/list.component.ts            | 3 +--
 .../admin/discount/discount-edit/discount-edit.component.html | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/admin/api-merchants/list/list.component.ts b/src/app/admin/api-merchants/list/list.component.ts
index 80e8696..67bd4d7 100644
--- a/src/app/admin/api-merchants/list/list.component.ts
+++ b/src/app/admin/api-merchants/list/list.component.ts
@@ -5,11 +5,10 @@ import {CommonsService} from '../../../services/commons.service';
 import {ApiMerchantsService} from '../../../services/api-merchants.service';
 import {ApiProductService} from '../../../services/api-product.service';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzMessageService} from 'ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 
 import {CompanyService} from '../../../services/company.service';
 import {MerchantService} from '../../../services/merchant.service';
-import {NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
 
 @Component({
     selector: 'app-list',
diff --git a/src/app/admin/discount/discount-edit/discount-edit.component.html b/src/app/admin/discount/discount-edit/discount-edit.component.html
index 7b73af9..2ac4557 100644
--- a/src/app/admin/discount/discount-edit/discount-edit.component.html
+++ b/src/app/admin/discount/discount-edit/discount-edit.component.html
@@ -23,7 +23,7 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
-            <div nz-col [nzSpan]="8">
+<!--            <div nz-col [nzSpan]="8">
                 <nz-form-item>
                     <nz-form-label [nzFor]="'discountName'" nzRequired>门店id</nz-form-label>
                     <nz-form-control nzErrorTip="请选择平台!">
@@ -33,7 +33,7 @@
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
-            </div>
+            </div>-->
             <div nz-col [nzSpan]="8">
                 <nz-form-item>
                     <nz-form-label [nzFor]="'discountName'" nzRequired>优惠券名称</nz-form-label>