Former-commit-id: 2e411d9e

Former-commit-id: 878449bd

Former-commit-id: 066362ae

Former-commit-id: 2a4c33d8

Former-commit-id: a7230020

Former-commit-id: 402e1039

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnParkWarnServiceImpl.java


Former-commit-id: 4be404c7

Former-commit-id: d5b83bfe

Former-commit-id: 798de39a

Former-commit-id: bc721ba8

Former-commit-id: 73a4e1d4

Former-commit-id: f3c5fcb6

Former-commit-id: 25c60d34

Former-commit-id: 3649d8bb

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java


Former-commit-id: 5e8f2067

Former-commit-id: 56f3a380

Former-commit-id: 785bb2d8

Former-commit-id: 30a7fe98

Former-commit-id: 29286f55

Former-commit-id: 53204927

Former-commit-id: 39953de2