sync master

2025-12-05 09:56:09 +00:00 · 2019-06-03 00:32:13 +08:00
parent 8d3a1a5add
commit 7e457f7e41
761 changed files with 123 additions and 3163 deletions
--- a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */