fix bug

src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html

@@ -221,13 +221,8 @@
     </ng-template>
   </div>
 </nz-card>
-<<<<<<< HEAD
-<nz-card>
-  <nz-tabset >
-=======
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
   <nz-tabset>
->>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445
     <nz-tab nzTitle="风险异常检测">
      <div  *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
       <div>
@@ -241,14 +236,9 @@
      </div>
     </nz-tab>
     <nz-tab nzTitle="异常预警">
-<<<<<<< HEAD
-      <st  #st [data]="warringList" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
-      </st>
-=======
       <st #st [data]="service.$api_get_order_abnormalWarning" [columns]="logColumns3"
         [res]="{ reName: { list: 'data' } }" [req]="{params:{id:route.snapshot.params.id}}"
         [page]="{ show: false, showSize: false }"> </st>
->>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445
     </nz-tab>
     <nz-tab nzTitle="操作日志">
       <st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">