# Conflicts:
#	performance-api/src/main/java/com/clx/performance/param/app/collect/CarrierDriverCollectTransportIntentionAddParam.java
#	performance-api/src/main/java/com/clx/performance/param/app/collect/CarrierDriverCollectTransportIntentionEditParam.java

# Conflicts:
#	clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

# Conflicts:
#	clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

# Conflicts:
#	clx-performance-web/pom.xml
#	clx-performance-web/src/main/java/com/clx/performance/controller/temp/TempFeignController.java
#	clx-performance-web/src/main/java/com/clx/performance/controller/temp/TempSdkController.java
#	clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	clx-performance-web/src/main/java/com/clx/performance/extranal/user/TruckUserService.java
#	clx-performance-web/src/main/java/com/clx/performance/extranal/user/impl/TruckUserServiceImpl.java
#	clx-performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
#	clx-performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerMqHandlerServiceImpl.java
#	clx-performance-web/src/main/java/com/msl/common/open/core/OpenEncrypt.java
#	performance-api/src/main/java/com/clx/performance/param/pc/vehiclewarn/VehicleWarnUserConfigUpdateParam.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/broker/TransportPayConfirmParam.java