Merge remote-tracking branch 'origin/main'

das/src/main/java/com/das/modules/auth/controller/SysRoleController.java

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

das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java

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