-
# Conflicts: # src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java # src/main/java/com/bsth/data/gpsdata/arrival/utils/ScheduleSignalState.java
-
# Conflicts: # src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java # src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java # src/main/java/com/bsth/data/gpsdata/arrival/entity/RouteReverse.java # src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java # src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java # src/main/java/com/bsth/data/gpsdata/arrival/handlers/ReverseSignalHandle.java # src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
-
minhang
-
minhang
-
# Conflicts: # src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java # src/main/java/com/bsth/data/gpsdata/analyse/components/GpsArrival.java # src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
-
minhang # Conflicts: # src/main/java/com/bsth/data/gpsdata/GpsRealData.java # src/main/resources/ms-jdbc.properties