Merge branch 'master-chw-bug' into dev-chw

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -238,6 +238,10 @@ public class VehicleActiveService {
             }
             //2019-11-22 16:30 还原还车时修改车辆停靠分公司需求
             vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+            //当所属门店和还车门店一致，修改经营门店为还车门店
+            if (vehicle.getSubordinateBranch().equals(vehicleBookRecord.getRetCompany())) {
+                vehicle.setManageCompanyId(vehicleBookRecord.getRetCompany());
+            }
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());