解决冲突

src/app/routes/contract-management/components/contract-list/contract-list.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-07 15:57:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:16:12
+ * @LastEditTime : 2022-02-23 20:11:50
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-list\\contract-list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -53,6 +53,10 @@
     <ng-template st-row="contractCode" let-item let-index="index">
       <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
     </ng-template>
+    <ng-template st-row="signingObject" let-item let-index="index">
+     <span *ngIf="item.signingObject == 0"></span>
+     <span></span>
+    </ng-template>
   </st>
 </nz-card>