解决冲突

2022-02-23 16:20:39 +08:00
parent 8ef9e67941
commit 5832cc4fba
25 changed files with 253 additions and 215 deletions
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@ -24,7 +24,7 @@
        [nzLoading]="service.http.loading"
        (click)="st?.load(1)"
        >查询</button>
-      <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-view'"
+      <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-export'"
        >导出</button
      >
      <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>