Commit 2c3c7b2ce6927b58a3033fa167e3fb0d6ecede55

Authored by 潘钊
2 parents f134136e e446403e

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

# 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
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at