diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
index b39a901c..605f7ef8 100644
--- 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);