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

cjl

2023-07-10 90362d592d28927e5ab56f9b24f97d1f9089b50b

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

@@ -1,4 +1,3 @@
/*
package com.moral.api.kafka.consumer;

import com.moral.api.service.*;
@@ -19,10 +18,7 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;

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


@Component
@Slf4j
@@ -203,4 +199,3 @@
        }
    }
}
*/