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

疯狂的狮子li

2021-06-02 a4edce5a93628e459f0c63071e6383383d86520c

 ruoyi-ui/src/api/login.js

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