From a3eaa78c6d839b640c728f4c7d8eb27732627b07 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 14:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into qa

---
 screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
index 536c6f0..94fd662 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
@@ -1,4 +1,3 @@
-/*
 
 package com.moral.api.exception.consumer;
 
@@ -25,17 +24,22 @@
 import java.util.concurrent.CopyOnWriteArraySet;
 
 
-*/
-/**
+/*
+*
  * @ClassName SecondsDataConsumer1
  * @Description TODO
  * @Author ���������
  * @Date 2021/6/15 14:49
  * @Version TODO
- **//*
+ *
+*/
 
 
-@Component
+
+
+/*@Component*/
+
+/*@Component*/
 @Slf4j
 public class SecondDataConsumer implements ConsumerSeekAware {
 
@@ -123,4 +127,3 @@
 }
 
 
-*/

--
Gitblit v1.8.0