# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDetailDao.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/settle/SettlementMqHandlerService.java
#	performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerService.java