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

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

 screen-common/src/main/java/com/moral/constant/KafkaConstants.java

@@ -37,7 +37,6 @@
    * */
    public static final String CRUISER_TOPIC_HOUR = "cruiser_hour_data";


    /**
     * 存入数据库的消费组
     */