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

wangqi

2021-03-30 f7ba8b6aab4a763feee8938e93c97079b52baf1d

 src/utils/axios.js

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

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