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

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

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleHolidayPriceInfoMapper">
 
-    <select id="getAll" resultType=" com.xxfc.platform.vehicle.pojo.vo.VehicleHolidayPriceInfoVo">
+    <select id="getAll" resultType="com.xxfc.platform.vehicle.pojo.vo.VehicleHolidayPriceInfoVo">
         select festival_id, festival_day, MIN(festival_date) as startTime, MAX(festival_date) as endTime, rent_price, rent_free_day from vehicle_holiday_price_info
         GROUP BY festival_id,festival_day,rent_price, rent_free_day
         HAVING festival_id = #{festivalId}