Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/api/ecw/orderException.js

@@ -107,8 +107,9 @@ export function exportExcel(params) {
   return request({
     url: '/ecw/order-exception/export-excel',
     method: 'get',
+    timeout: 6*60*1000,
     params,
-    timeout: 3*60*1000,
+    //timeout: 3*60*1000,
     responseType: 'arraybuffer'
   })
 }