Merge remote-tracking branch 'origin/develop' into develop

zhangshuaibao

2021-04-12 188abb2598a9253b19762d0cf4c4b36db64bfe8b

 src/utils/axios.js

@@ -83,7 +83,7 @@

// 创建axios实例
const Service = axios.create({
  timeout: 5000
  timeout: 1000 * 30
})

const CancelToken = axios.CancelToken