From 7b93976dbf3e432f9c7a344a20e78607e5cccd43 Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Wed, 9 Mar 2022 10:59:13 +0800
Subject: [PATCH 1/2] fix style

---
 src/app/app.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 5e5b7df5..69b42ef3 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -49,6 +49,7 @@ export class AppComponent implements OnInit {
         this.modalSrv.closeAll();
       }
     });
+    // 适配放大150%的屏幕
     const screen: any = window.screen
     var zoom = window.devicePixelRatio || screen.deviceXDPI / screen?.logicalXDPI;
     // console.log(zoom)

From 26ae59d300171b6bedb474b12052b7b055ed962f Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 9 Mar 2022 11:12:33 +0800
Subject: [PATCH 2/2] edit

---
 .../components/express-info/express-info.component.html      | 5 -----
 .../components/express-info/express-info.component.ts        | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git 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
index f8a9aacc..c3724328 100644
--- 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>
\ No newline at end of file
diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.ts b/src/app/routes/ticket-management/components/express-info/express-info.component.ts
index 71bcb041..6277ed0a 100644
--- a/src/app/routes/ticket-management/components/express-info/express-info.component.ts
+++ b/src/app/routes/ticket-management/components/express-info/express-info.component.ts
@@ -40,7 +40,7 @@ export class ExpressInfoComponent implements OnInit {
 
   columns: STColumn[] = [
     { title: '', index: 'key', type: 'checkbox', width: 50 },
-    { title: '快递单号', index: 'expressCode', width: 150 },
+    { title: '快递单号', index: 'expressCode', width: 170 },
     { title: '快递公司', index: 'expresscompany', width: 120 },
     { title: '快递费用', index: 'description', width: 120 },
     {