Merge remote-tracking branch 'origin/hylyasrs' into hylyasrs

whycq

2022-08-10 ef61fe1603c5c4f98d75061981e485b3ab7678f3

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