From 6344a8b6b7e2853dbfa9e6506ff2e17a31930297 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 10 Jul 2023 14:17:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 7 +------
1 files changed, 1 insertions(+), 6 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 bc272cd..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
@@ -1,4 +1,3 @@
-/*
package com.moral.api.kafka.consumer;
import com.moral.api.service.*;
@@ -19,10 +18,7 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
-*/
-/*
- * ���������������������
- * *//*
+
@Component
@Slf4j
@@ -203,4 +199,3 @@
}
}
}
-*/
--
Gitblit v1.8.0