Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * Created by ace on 2017/9/15.
@@ -81,7 +82,6 @@ public interface VehicleFeign {
      */
     @GetMapping("/sysRegion/getSysRegionById/{id}")
    RestResponse getSysRegionById(@PathVariable(value = "id") Integer id);
-   RestResponse getSysRegionById(@PathVariable Integer id);
     /**
      * 多个城市code获取城市代码
      * @param ids