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

cjl

2023-09-01 979166aaa979629bf223a44a46aeb6d0c0e61aec

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

@@ -108,6 +108,7 @@
            String id = map.get("id").toString();
            if (id.equals("71")){
                log.warn(id, msg);
                ack.acknowledge();
                return;
            }
//            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");