Commit c530e6c1 authored by KeYong's avatar KeYong

提交冲突

parent c7327d86
...@@ -40,9 +40,6 @@ public class KafkaConsumerService { ...@@ -40,9 +40,6 @@ public class KafkaConsumerService {
@Value("classpath:/json/commonMessage.json") @Value("classpath:/json/commonMessage.json")
private Resource commonMessage; private Resource commonMessage;
@Value("classpath:/json/commonMessage.json")
private Resource commonMessage;
/** /**
* 批量消费kafka消息 * 批量消费kafka消息
* Kafka消息转emq * Kafka消息转emq
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment