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

chenyabin

2021-04-15 8f327155ec6a3d5ad1f1ff4e170ed85747439373

 src/utils/axios.js

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

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

const CancelToken = axios.CancelToken