# Conflicts:
#	performance-api/src/main/java/com/clx/performance/param/pc/vehiclewarn/VehicleWarnUserConfigUpdateParam.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/vehiclewarn/VehicleWarnUserVO.java
#	performance-web/src/main/java/com/clx/performance/config/ClxMessageConfig.java
#	performance-web/src/main/java/com/clx/performance/controller/pc/vehiclewarn/VehicleWarnUserController.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/vehiclewarn/VehicleWarnUserDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java
#	performance-web/src/main/java/com/clx/performance/model/vehiclewarn/VehicleWarnUser.java
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnUserServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java