edit

2022-03-09 11:12:33 +08:00
parent d97800841d
commit 26ae59d300
2 changed files with 1 additions and 6 deletions
--- a/src/app/routes/ticket-management/components/express-info/express-info.component.html
+++ b/src/app/routes/ticket-management/components/express-info/express-info.component.html
@ -19,11 +19,6 @@
    <div class="mt-md mb-sm">
        <button nz-button nzType="primary" (click)="printOrder()">打印面单</button>
    </div>
-<<<<<<< HEAD
-    <st #st [data]="url" [columns]="columns" [req]="{  process:beforeReq }" [loading]="service.http.loading" [page]="{}" 
-        (change)="stChange($event)" [scroll]="{ x: '1200px' }" ></st>
-=======
    <st #st [data]="url" [columns]="columns" [req]="{  process:beforeReq }" [loading]="service.http.loading" [page]="{}" [scroll]="{x:'1200px'}"
        (change)="stChange($event)"></st>
->>>>>>> 9894aafcc1c3326f1d6dcb9a0c3eb42079a623a9
 </nz-card>