Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-23 df2f2b669f4196f599ca4db91917314ddc4ed94f

 screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java

@@ -10,7 +10,6 @@
import org.springframework.stereotype.Component;

import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;

/**