Merge remote-tracking branch 'origin/feature/v1.0.2' into feature/v1.0.2

This commit is contained in:
zhangyuanzhen
2020-03-13 17:11:54 +08:00

View File

@@ -11,7 +11,7 @@ public class MarkerCarInfo implements Serializable {
private String carBrandLogoUrl;
private String carTypeName;
private int carType;
private int vehicleType;
private CarLiveInfo carLiveInfo;
public String getCarBrandLogoUrl() {
@@ -36,12 +36,12 @@ public class MarkerCarInfo implements Serializable {
this.carTypeName = carTypeName;
}
public int getCarType() {
return carType;
public int getVehicleType() {
return vehicleType;
}
public void setCarType(int carType) {
this.carType = carType;
public void setVehicleType(int vehicleType) {
this.vehicleType = vehicleType;
}
public CarLiveInfo getCarLiveInfo() {