同步

2021-10-19 17:46:16 +08:00
parent e32f1adbe2
commit 5915e15b05
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
@@ -116,6 +116,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
        public async Task<Result> GetRolesByUserId(int userId)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
        {            
            var roleList = await _userService.GetRolesByUser(new user() { id=userId});
@@ -123,6 +124,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
 =======
 >>>>>>> Stashed changes
 =======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
        {
            var _user =await _userService.GetEntityById(userId);