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

jinpengyong

2021-06-23 df2f2b669f4196f599ca4db91917314ddc4ed94f

 screen-manage/src/main/resources/application-dev.yml

@@ -92,12 +92,9 @@
    enable:
      auto:
        commit: false
    group:
      id: test
    servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
    session:
      timeout: 6000
    topic: test_topic
    zookeeper:
      connect: 192.168.0.16:2181,192.168.0.17:2181,192.168.0.18:2181
  producer: