Merge remote-tracking branch 'origin/master' into 4.3.x

This commit is contained in:
William Cheng
2019-12-20 23:21:21 +08:00
92 changed files with 446 additions and 96 deletions

View File

@@ -268,7 +268,7 @@
<swagger-annotations-version>1.5.22</swagger-annotations-version>
<jackson-version>2.9.10</jackson-version>
<jackson-databind>2.9.10.1</jackson-databind>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<junit-version>4.12</junit-version>
</properties>
</project>