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

cjl

2023-07-24 3ce298bd6f26c0807074dc50c73abf0c3abeaf53

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

@@ -19,10 +19,7 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;

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


@Component
@Slf4j