Merge branch 'master' into dev

This commit is contained in:
zengqiao
2020-09-25 11:44:23 +08:00
44 changed files with 1096 additions and 167 deletions

View File

@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.6</version>
<version>3.4.14</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>