Merge branch 'master-background-manager' into dev

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java

@@ -17,6 +17,7 @@ public interface VehicleMapper extends Mapper<Vehicle> {
     public   List<ResultVehicleVo> getByPageNotAllData(Map<String, Object> params);
 
 
+
     public int updateStatusById(Map<String, Object> params);
 
     /**