sync master

This commit is contained in:
William Cheng
2019-06-03 00:32:13 +08:00
parent 8d3a1a5add
commit 7e457f7e41
761 changed files with 123 additions and 3163 deletions

View File

@@ -121,11 +121,7 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<<<<<<< HEAD
<openapi-generator-version>4.1.0-SNAPSHOT</openapi-generator-version>
=======
<openapi-generator-version>4.0.2-SNAPSHOT</openapi-generator-version>
>>>>>>> origin/master
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.8.1</junit-version>
</properties>