同步

2021-10-19 17:45:52 +08:00
parent 1d33fa487d
commit a443f41b11
1 changed files with 3 additions and 0 deletions
--- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
+++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
@@ -114,10 +114,13 @@ namespace Yi.Framework.ApiMicroservice.Controllers
        /// <returns></returns>
        [HttpGet]
        public async Task<Result> GetRolesByUserId(int userId)
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
        {            
            var roleList = await _userService.GetRolesByUser(new user() { id=userId});
 =======
+=======
+>>>>>>> Stashed changes
        {
            var _user =await _userService.GetEntityById(userId);
            var roleList = await _userService.GetRolesByUser(_user);