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

zyx

2023-08-04 d55581ed00fd0a8ecce78a6ebe6f9e2ee86274b3

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