Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-30 373c036205c6d8ac3871857da7b3c7a44e384086

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

@@ -107,6 +107,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");