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

wangqi

2021-03-30 9f77315b5327bb5f32eacb31a69c9601a30e3800

 src/utils/axios.js

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

// 创建axios实例
const Service = axios.create({
  timeout: 1000
  timeout: 5000,
  baseURL: 'http://10.246.162.140:8080/'
})

const CancelToken = axios.CancelToken