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

疯狂的狮子li

2021-09-06 ab4b75fe30f9a3cf08e3ced667c3ec8c711ca939

 ruoyi-ui/src/api/login.js

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