Merge remote-tracking branch 'origin/master'

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

@@ -114,11 +114,15 @@ public class SysLoginController
             String nickName = user.getNickName();
             Long userId = user.getUserId();
             String avatar = user.getAvatar();
-            Map<String,Object> map = new HashMap<>(2);
+            String password = user.getPassword();
+            String phonenumber = user.getPhonenumber();
+            Map<String,Object> map = new HashMap<>(6);
             map.put("userName",userName);
             map.put("nickName",nickName);
             map.put("userId",userId);
             map.put("avatar",avatar);
+            map.put("password",password);
+            map.put("phonenumber",phonenumber);
             return AjaxResult.success(map);
         }
         return AjaxResult.error("获取用户信息异常");