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

疯狂的狮子li

2021-10-11 741a5b275ba3d1a9099d2c5dce94e7a192db66c1

 ruoyi-ui/src/api/login.js

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