Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

18516761980

2022-08-18 9a6a85eecf1dd8489de45eb3ab804d3e33605be2

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