Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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)

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>

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 },
     {