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

18516761980

2022-05-24 b76c09d2c5f16de0e3777350b8d7ab48ea55aaa8

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