# Conflicts:
#	performance-api/src/main/java/com/clx/performance/vo/mq/settle/SettlementDriverSettleMqParam.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java
#	performance-web/src/main/java/com/clx/performance/config/RabbitSettlementConfig.java
#	performance-web/src/main/java/com/clx/performance/constant/RabbitKeySettlementConstants.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/settle/SettlementDriverDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java
#	performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementPostServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/settle/SettlementPostService.java