解决冲突

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -378,6 +378,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         grid: { lg: 8, md: 12, sm: 12, xs: 24 }
       },
       $carModel: {
+        spanLabelFixed: 100,
         grid: { span: 8 }
       },
       $carLength: {

src/app/routes/supply-management/components/release-publish/release-publish.component.ts

@@ -388,6 +388,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
         grid: { lg: 8, md: 12, sm: 12, xs: 24 }
       },
       $carModel: {
+        spanLabelFixed: 100,
         grid: { span: 8 }
       },
       $carLength: {