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

疯狂的狮子li

2021-06-11 a51f7d52ed93f62f5f5eeb445163ab48a523dbe2

 ruoyi-ui/src/api/login.js

@@ -11,7 +11,7 @@
  return request({
    url: '/login',
    method: 'post',
    params: data
    data: data
  })
}