Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-09 9c06fb2da3250f7b8bfcb5a2b8bd227528af2678

 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java

@@ -60,6 +60,7 @@
        map.put("token", jwtToken);
        map.put("reToken", jwtReToken);
        map.put("name", user.getName());
        map.put("userId", user.getId());
        map.put("power", powerService.selectPowerByRoleId(user.getRoleId()));
        return Result.success("登录成功", map);
    }