From e77cdf62567ba92d2d3131da20429dcbfc3b7ea2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 31 Aug 2023 16:11:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

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

diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index 8ebcc3d..32c1fe2 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -1,3 +1,4 @@
+/*
 
 package com.moral.api.exception.consumer;
 
@@ -27,10 +28,12 @@
 import com.moral.constant.KafkaConstants;
 
 
+*/
 /*
  * ������������������������
  *
-*/
+*//*
+
 
 
 
@@ -121,3 +124,4 @@
     }
 }
 
+*/

--
Gitblit v1.8.0