解决冲突

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

@@ -616,13 +616,14 @@ export class SupplyManagementVehicleComponent implements OnInit {
             click: _record => this.nextOrder(_record),
             acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] }
           },
-          {type: 'divider'},
           {
             text: '重新指派　',
             click: _record => this.assignedCar(_record),
             iif: item => item.resourceStatus === '1' && item.serviceType === '2',
             acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] }
-          }
+          },
+          {type: 'divider'},
+
         ]
       }
     ];