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

2019-12-20 20:38:49 +08:00
parent f6dbd48b9c 3146e80c61
commit 531dc30917
1191 changed files with 28800 additions and 16038 deletions
--- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt
+++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt
@@ -16,10 +16,10 @@ import io.swagger.annotations.ApiModelProperty

 /**
 * A pet for sale in the pet store
- * @param id 
- * @param category 
 * @param name 
 * @param photoUrls 
+ * @param id 
+ * @param category 
 * @param tags 
 * @param status pet status in the store
 */