Merge remote-tracking branch 'origin/master'

Administrator

2023-07-28 c45ce58884c59ddf8a6051ba370215e6f62adeb8

 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