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

cjl

2023-08-18 41660a11fb793295d44a4d47949284105e429395

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

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


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