# Conflicts:
#	clx-performance-web/src/main/java/com/clx/performance/config/ConfiguredOpenProperties.java

Merge remote-tracking branch 'origin/v29.3_carrier_messsage_20241016' into 33.6_app_carrier_messsage_20241106

Merge branch 'v29.3_carrier_messsage_20241016' of t.clxkj.cn:clx-java/clx-performance into 33.6_app_carrier_messsage_20241106

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

# Conflicts:
#	clx-performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

# Conflicts:
#	clx-performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java