Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

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',

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>