# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

Master bug rent

See merge request !16

预订时间处理bug

See merge request !15

master-bug-vmodel-master

See merge request !13

Master-bug-master-merge

See merge request !12

Dev-master-merge

See merge request !11