解决冲突

src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-28 14:53:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-22 10:30:33
+ * @LastEditTime : 2022-04-27 14:12:45
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add-partnerlist\\add-partnerlist.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -25,6 +25,5 @@
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
         [scroll]="{ x: '1000' }">
       </st>
-    <button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary" acl
-      [acl-ability]="['AbnormalAppear-batchReply']">批量选择</button>
+    <button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary">批量选择</button>
 </nz-card>

src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts

@@ -55,7 +55,6 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit {
         {
           text: '添加',
           click: _record => this.add(_record),
-          acl: { ability: ['AbnormalAppear-reply'] }
         }
       ]
     }