Merge remote-tracking branch 'origin/master'

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/VehicleModelController.java

@@ -54,6 +54,18 @@ public class VehicleModelController extends CommonBaseController {
         return objectRestResponse;
     }
 
+
+    @ApiOperation("车型详情")
+    @GetMapping(value = "/detail")
+    @IgnoreUserToken
+    public ObjectRestResponse<VModelDetailVO> getDetails(@RequestParam("id") @ApiParam("车型名称") Integer id) {
+        ObjectRestResponse<VModelDetailVO> objectRestResponse = vehicleFeign.detailByParam(BeanUtil.beanToMap(new VehicleModel(){{
+            setId(id);
+        }}, false, true));
+        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(objectRestResponse.getData().getConfig()));
+        return objectRestResponse;
+    }
+
     /**
      * 车型列表查
      *