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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 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;