Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-08-23 ecff6c40a1728c61c6a9a713df721b0eb31a616c

 screen-api/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java

@@ -46,7 +46,7 @@
    public ConsumerFactory<String, String> consumerFactory() {
        return new DefaultKafkaConsumerFactory<>(consumerConfigs());
    }
    

    @Bean("secondDataListenerFactory")
    public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String, String>> secondDataListenerFactory(){
        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();