解决冲突

src/app/routes/supply-management/components/bulk/bulk.component.ts

@@ -328,6 +328,8 @@ export class SupplyManagementBulkComponent implements OnInit {
             click: (_record) => this.nextOrder(_record),
             acl: { ability: ['SUPPLY-INDEX-bulkPlaceOrder'] },
           },
+          {type: 'divider'},
+
         ],
       },
     ];

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -597,6 +597,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
             click: _record => this.nextOrder(_record),
             acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] }
           },
+          {type: 'divider'},
           {
             text: '重新指派　',
             click: _record => this.assignedCar(_record),