Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-04-03 14:54:50 +08:00
91 changed files with 282 additions and 262 deletions

View File

@@ -348,7 +348,7 @@ paths:
description: "Invalid Order"
x-contentType: "application/json"
x-accepts: "application/json"
/store/order/{orderId}:
/store/order/{order_id}:
get:
tags:
- "store"
@@ -360,7 +360,7 @@ paths:
- "application/xml"
- "application/json"
parameters:
- name: "orderId"
- name: "order_id"
in: "path"
description: "ID of pet that needs to be fetched"
required: true
@@ -390,7 +390,7 @@ paths:
- "application/xml"
- "application/json"
parameters:
- name: "orderId"
- name: "order_id"
in: "path"
description: "ID of the order that needs to be deleted"
required: true