Merge branch 'master' of https://gitea.qinmian.online/ToBeNumberOne/god-car-data
# Conflicts: # src/main/java/com/god/data/service/impl/RealTimeTrajectoryEvent.javamaster
commit
0a10ab2dbc
# Conflicts: # src/main/java/com/god/data/service/impl/RealTimeTrajectoryEvent.javamaster