Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子Li

2022-10-12 95010d4a4c21cd53b78f51cbd518a315a8861fbc

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

@@ -68,6 +68,8 @@
        user.setUserId(getUserId());
        user.setUserName(null);
        user.setPassword(null);
        user.setAvatar(null);
        user.setDeptId(null);
        if (userService.updateUserProfile(user) > 0) {
            return R.ok();
        }