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

chen_xi

2022-11-17 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a

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

@@ -196,7 +196,7 @@
            historySecondCruiserService.insertHistorySecond(data);
            ack.acknowledge();
        } catch (Exception e) {
            log.error("param{}" + msg);
            log.error("param{}" + e);
        }
    }
}