Merge remote-tracking branch 'refs/remotes/ruoyi/master'

# Conflicts: # README.md # ruoyi-ui/package.json # ruoyi-ui/src/views/index.vue # ruoyi-ui/vue.config.js
2024-09-05 22:35:52 +08:00
parent 19e44336f7 8a0a3a03fe
commit 27b56d3a01
50 changed files with 782 additions and 300 deletions
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -105,6 +105,7 @@ export function uploadAvatar(data) {
  return request({
    url: '/system/user/profile/avatar',
    method: 'post',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
    data: data
  })
 }