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

@@ -49,8 +49,8 @@ public class StoreApi {
}
// create path and map variables
String localVarPath = "/store/order/{orderId}"
.replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
String localVarPath = "/store/order/{order_id}"
.replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString()));
// query params
List<Pair> localVarQueryParams = new ArrayList<Pair>();
@@ -126,8 +126,8 @@ public class StoreApi {
}
// create path and map variables
String localVarPath = "/store/order/{orderId}"
.replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
String localVarPath = "/store/order/{order_id}"
.replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString()));
// query params
List<Pair> localVarQueryParams = new ArrayList<Pair>();