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

wangqi

2021-03-31 e0eb378045eb18117fcf0a1eac6dad57ce6f743b

 src/utils/axios.js

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

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

const CancelToken = axios.CancelToken