# Conflicts:
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java


Former-commit-id: 326f4cac

# 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

Former-commit-id: 61fb4753

Former-commit-id: 01b7b0cf

Former-commit-id: 9407d8d6

Former-commit-id: 6e2f61af

Former-commit-id: f6c4e952

Former-commit-id: 93adf07c

Former-commit-id: 7f5ac2c7

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java


Former-commit-id: 9861c8fc

Former-commit-id: c563e802

Former-commit-id: b839894c

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


Former-commit-id: 3526f9a1