Merge remote-tracking branch 'origin/4.1.x' into sync_41x_50x

This commit is contained in:
wing328
2019-06-27 18:27:20 +08:00
1243 changed files with 38715 additions and 15082 deletions

View File

@@ -48,6 +48,11 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>${springfox-version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.11</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>