From 6eb8f65d4a69a550945a92cc916d3c63dee739fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:55:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb_21' into qa

---
 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 30041ec..5ee1a09 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,3 +1,4 @@
+/*
 package com.moral.api.kafka.consumer;
 
 import com.moral.api.service.*;
@@ -214,3 +215,4 @@
         }
     }
 }
+*/

--
Gitblit v1.8.0