Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-23 b1f91d23c01266dda8cad34aa866bcac741a21cf

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -129,6 +129,7 @@
        {
            LoginUser loginUser = getLoginUser();
            String avatar = FileUploadUtils.upload(ARDConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
//            String avatar = MinioUtils.putObjectAndGetUrl("useravatar", file);
            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
            {
                AjaxResult ajax = AjaxResult.success();