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 @@ -
+
优惠券名称