From 90362d592d28927e5ab56f9b24f97d1f9089b50b Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Mon, 10 Jul 2023 21:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index 2780fe2..d6661e4 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -18,9 +18,8 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
-/*
- * ���������������������
- * */
+
+
@Component
@Slf4j
public class DeviceConsumer {
@@ -58,7 +57,7 @@
}
//������������
- data.remove("time");
+// data.remove("time");
data.remove("entryTime");
Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
Map<String, Object> newMap = new HashMap<>();
--
Gitblit v1.8.0