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

This commit is contained in:
wing328
2017-03-31 01:21:03 +08:00
7 changed files with 191 additions and 6 deletions

View File

@@ -434,7 +434,7 @@
if (accept) {
request.accept(accept);
}
if (returnType === 'Blob') {
request.responseType('blob');
}

View File

@@ -97,10 +97,10 @@
obj['string'] = ApiClient.convertToType(data['string'], 'String');
}
if (data.hasOwnProperty('byte')) {
obj['byte'] = ApiClient.convertToType(data['byte'], Blob);
obj['byte'] = ApiClient.convertToType(data['byte'], 'Blob');
}
if (data.hasOwnProperty('binary')) {
obj['binary'] = ApiClient.convertToType(data['binary'], Blob);
obj['binary'] = ApiClient.convertToType(data['binary'], 'Blob');
}
if (data.hasOwnProperty('date')) {
obj['date'] = ApiClient.convertToType(data['date'], 'Date');