Merge remote-tracking branch 'origin/main'

This commit is contained in:
houwei 2024-07-01 09:20:20 +08:00
commit 562ec7eb3d
2 changed files with 2 additions and 2 deletions

View File

@ -47,7 +47,7 @@ public class SysRoleController {
* 修改菜单接口 * 修改菜单接口
* @return 结果提示信息 * @return 结果提示信息
*/ */
@PostMapping("/update") @PostMapping("/update")
public R<?> updateRole(@RequestBody SysRoleDto sysRoleDto) { public R<?> updateRole(@RequestBody SysRoleDto sysRoleDto) {
//判断是否有权限 //判断是否有权限
boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString());

View File

@ -146,7 +146,7 @@ public class SysUserServiceImpl implements SysUserService {
} }
} }
SysUser newSysUser = new SysUser(); SysUser newSysUser = new SysUser();
BeanUtils.copyProperties(sysUserDto, newSysUser, "password"); BeanUtils.copyProperties(sysUserDto, newSysUser);
newSysUser.setUpdatedTime(new Date()); newSysUser.setUpdatedTime(new Date());
sysUserMapper.updateById(newSysUser); sysUserMapper.updateById(newSysUser);