# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOrderChildRiskServiceImpl.java

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

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

Merge remote-tracking branch 'origin/v26.2-jdk17springboot3-20240912' into v26.2-jdk17springboot3-20240912

# 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/pom.xml

# 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

# Conflicts:
#	performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadAndUnloadAgainParam.java
#	performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadParam.java
#	performance-api/src/main/java/com/clx/performance/param/app/OrderChildUnloadParam.java