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

疯狂的狮子li

2021-06-10 b348b766fc4cd9079d1bee1fed32fc21bfe01436

 ruoyi-ui/src/api/login.js

@@ -37,4 +37,4 @@
    url: '/captchaImage',
    method: 'get'
  })
}
}