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

疯狂的狮子li

2021-06-21 f585992c6f14c20a034c302970b7f46839099c08

 ruoyi-ui/src/api/login.js

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