From ecff6c40a1728c61c6a9a713df721b0eb31a616c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 23 Aug 2023 13:12:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' 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