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

ChenZeping

2021-05-08 4879421ff17a679a838de208125617d2eaa351a2

 src/utils/axios.js

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

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

const CancelToken = axios.CancelToken