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

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