From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb

---
 screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 bb8d4a2..ba639bd 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,5 @@
 /*
+
 package com.moral.api.exception.consumer;
 
 import com.alibaba.fastjson.JSON;
@@ -23,14 +24,19 @@
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+
 */
-/**
+/*
+*
  * @ClassName SecondsDataConsumer1
  * @Description TODO
  * @Author ���������
  * @Date 2021/6/15 14:49
  * @Version TODO
- **//*
+ *
+*//*
+
+
 
 @Component
 @Slf4j
@@ -119,4 +125,5 @@
 
 }
 
+
 */

--
Gitblit v1.8.0