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

chenyabin

2021-04-08 a7b7b5f1f85bd30b171e17056bf9ae9830fb36cb

 src/utils/axios.js

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

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

const CancelToken = axios.CancelToken