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

kaiyu

2021-06-02 a52b9c0e0f708b36d35dbc95c591645d249d7db7

 screen-api/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java

@@ -27,7 +27,7 @@
    private String sessionTimeout;
    @Value("${kafka.consumer.auto.commit.interval}")
    private String autoCommitInterval;
    @Value("${kafka.consumer.group.id}")
    @Value("${kafka.consumer.groupMenu.id}")
    private String groupId;
    @Value("${kafka.consumer.auto.offset.reset}")
    private String autoOffsetReset;