解决冲突

src/app/routes/supply-goods/components/carload/carload.component.ts

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: wsm
  * @Date: 2021-07-15 09:42:57
- * @LastEditTime: 2022-01-13 15:26:51
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2022-02-25 15:34:50
+ * @LastEditors  : Shiming
  * @Reference:
  */
 import { AfterViewInit, Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
@@ -128,15 +128,15 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi
             showRequired: false,
           },
         },
-        unifiedSocialCreditCode2: {
-          title: '油卡',
-          type: 'string',
-          minimum:0,
-          maximum:99999,
-          ui: {
-            showRequired: false,
-          },
-        },
+        // unifiedSocialCreditCode2: {
+        //   title: '油卡',
+        //   type: 'string',
+        //   minimum:0,
+        //   maximum:99999,
+        //   ui: {
+        //     showRequired: false,
+        //   },
+        // },
         unifiedSocialCreditCode3: {
           title: '回单付',
           type: 'string',