xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步

Browse Source
This commit is contained in:
橙子
2021-10-19 17:46:09 +08:00
parent a443f41b11
commit e32f1adbe2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
View File

@@ -115,11 +115,14 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpGet] [HttpGet]
public async Task<Result> GetRolesByUserId(int userId) public async Task<Result> GetRolesByUserId(int userId)
<<<<<<< Updated upstream <<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream <<<<<<< Updated upstream
{ {
var roleList = await _userService.GetRolesByUser(new user() { id=userId}); var roleList = await _userService.GetRolesByUser(new user() { id=userId});
======= =======
======= =======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes >>>>>>> Stashed changes
{ {
var _user =await _userService.GetEntityById(userId); var _user =await _userService.GetEntityById(userId);