Merge branch 'master-background-manager' into dev

0a2aa302 · jiaorz · 3c315236 · 76aa7b35 · 0a2aa302
Commit 0a2aa302 authored Oct 18, 2019 by jiaorz
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

VehicleController.java ...ava/com/xxfc/platform/vehicle/rest/VehicleController.java +3 -3

No files found.
--- a/xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
+++ b/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());
                }
            }
        }