Merge remote-tracking branch 'refs/remotes/origin/stasrs' into stasrs

Junjie

2023-03-14 163bdd3a71de83b9e36340be3fe6380b6758e4fd

 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);
    }