Merge branch 'master-vehicle-price' into dev-tiande

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleCommonPriceVo.java

@@ -20,4 +20,6 @@ public class VehicleCommonPriceVo extends VehicleCommonPriceInfo {
 	private String modelName;
 
 	private Integer vehicleBodyStatus;
+
+	private String vehicleId;
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleCommonPriceInfoMapper.xml

@@ -6,6 +6,7 @@
     <select id="selectList" resultType="com.xxfc.platform.vehicle.pojo.vo.VehicleCommonPriceVo">
         SELECT
         vci.*, v.`code`,
+        v.id as vehicleId,
         v.number_plate,
         FLOOR(
         YEAR (NOW()) - YEAR (v.vehicle_register_date)