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

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

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

@@ -18,9 +18,8 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;

/*
 * 普通设备消费者
 * */


@Component
@Slf4j
public class DeviceConsumer {