Merge remote-tracking branch 'origin/master'

Administrator

2023-08-10 931ad9c18321121d0b64e9f6e49592f0472289fa

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -142,7 +142,7 @@
    /**
     * 修改用户
     */

    @ApiOperation("修改用户")
    @PreAuthorize("@ss.hasPermi('system:user:edit')")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping