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

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourBanner.java

 package com.xxfc.platform.tour.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleModelMapper">
-  <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.entity.VehicleModel"
-          parameterMap="vehicleModel">
+  <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition"
+          resultMap="vehicleModel">
       select  * from  vehicle_model vm left join  vehicle v on vm.id=v.model_id and 1=1
       <if test="vmqc.vehicleType!=null and vmqc.vehicleType!=''">
        and  v.keyword like CONCAT('%,',#{vmqc.vehicleType},',%')
@@ -16,7 +16,9 @@
        and  v.keyword like CONCAT('%,',#{vmqc.takeAlieTheNumber},',%')
       </if>
 
-
   </select>
+    <resultMap id="vehicleModel" type="com.xxfc.platform.vehicle.entity.VehicleModel" >
+       <id property="id" column="id"></id>
+    </resultMap>
 
 </mapper>
\ No newline at end of file