Commit c7cd69d4 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents d6d3c102 35b2697b
......@@ -114,8 +114,8 @@ public class UserController {
* @param id ID
* @return 用户信息
*/
@GetMapping("/{id:\\d+}")
public R<UserVO> user(@PathVariable Long id) {
@GetMapping("/{id}")
public R<UserVO> user1(@PathVariable String id) {
return R.ok(userService.getUserVoById(id));
}
......
......@@ -60,7 +60,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* @param id 用户ID
* @return userVo
*/
UserVO getUserVoById(Long id);
UserVO getUserVoById(String id);
/**
* 查询用户列表
......
......@@ -77,7 +77,7 @@ public interface SysUserService extends IService<SysUser> {
* @param id 用户ID
* @return 用户信息
*/
UserVO getUserVoById(Long id);
UserVO getUserVoById(String id);
/**
* 查询上级部门的用户信息
......
......@@ -150,7 +150,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @return 用户信息
*/
@Override
public UserVO getUserVoById(Long id) {
public UserVO getUserVoById(String id) {
return baseMapper.getUserVoById(id);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment