# 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

Former-commit-id: dbbe6c38

Former-commit-id: 6eb71195

Former-commit-id: d0ea83d8

Former-commit-id: f2d61503

Former-commit-id: abfe6970

Former-commit-id: d3ec5e59

Former-commit-id: 76665d90

Former-commit-id: e92ee1b1

Former-commit-id: bfa5c7e7

Former-commit-id: 005db8ba

Former-commit-id: a462db4d

Former-commit-id: 2f7bfeaa

Former-commit-id: 466bb704

Former-commit-id: f222fdf9

Former-commit-id: b01a5896

Former-commit-id: e78e29d6

Former-commit-id: 75261cdb

Former-commit-id: b373ac29

Former-commit-id: 1b638469