From 2e586ec3808b5a6d170aba9ddcbf5ef7b69f9eef Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:56:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

---
 src/main/java/com/zy/common/web/AuthController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 3c67ff7..067d5e5 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -75,7 +75,7 @@
         userLogin.setCreateTime(new Date());
         userLoginService.insert(userLogin);
         Map<String, Object> res = new HashMap<>();
-        res.put("username", user.getNickname());
+        res.put("username", user.getUsername());
         res.put("token", token);
         return R.ok(res);
     }

--
Gitblit v1.9.1