Merge branch 'master-background-manager' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -412,7 +412,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
                     companyList.clear();
                     companyList.add(vehiclePlanDto.getParkBranchCompanyId());
                 } else {
-                    return ObjectRestResponse.succ();
+                    return ObjectRestResponse.succ(Maps.newHashMap());
                 }
             }
         }
@@ -422,7 +422,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
                     companyList.clear();
                     companyList.add(vehiclePlanDto.getSubordinateBranch());
                 } else {
-                    return ObjectRestResponse.succ();
+                    return ObjectRestResponse.succ(Maps.newHashMap());
                 }
             }
         }
@@ -437,7 +437,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
          Map<String, Object> map = Maps.newHashMap();
          map.put("vehicleWarningMsgs",vehicleWarningMsgs);
          map.put("vehicleAndModelInfoVo",pageDataVO);
-        map.put("vehicleCountVos",vehicleCountVos);
+         map.put("vehicleCountVos",vehicleCountVos);
         return ObjectRestResponse.succ(map);
     }