Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-17 2b53e9d86a358dcf2553e810cab46cba4aee161e

 ruoyi-ui/src/api/login.js

@@ -48,6 +48,6 @@
  return request({
    url: '/captchaImage',
    method: 'get',
   timeout: 20000
    timeout: 20000
  })
}