From 319fdcaa2d7979b056b2801e11d08fe6ecdff126 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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..4882e3d 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,14 +24,15 @@
 import java.util.concurrent.CopyOnWriteArraySet;
 
 
-*/
 /**
  * @ClassName SecondsDataConsumer1
  * @Description TODO
  * @Author ���������
  * @Date 2021/6/15 14:49
  * @Version TODO
- **//*
+ **/
+
+
 
 
 @Component
@@ -123,4 +123,3 @@
 }
 
 
-*/

--
Gitblit v1.8.0