diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 62cb7118e..89b452191 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -233,7 +233,7 @@ public class SysUserController {
         return result;
     }
 
-    @ApiOperation(value = "用户管理-部门配置")
+    @ApiOperation(value = "用户管理-部门分配")
     @RequiresPermissions("sys:user:depart")
     @RequestMapping(value = "/setDepart", method = RequestMethod.POST)
     public Result<SysUser> setDepart(@RequestBody JSONObject jsonObject) {
@@ -265,6 +265,78 @@ public class SysUserController {
         return result;
     }
 
+    /**
+     * 查询指定用户和部门关联的数据
+     *
+     * @param userId
+     * @return
+     */
+    @RequiresPermissions("sys:user:edit")
+    @ApiOperation(value = "用户管理-查询用户部门")
+    @RequestMapping(value = "/userDepartList", method = RequestMethod.GET)
+    public Result<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
+        Result<List<DepartIdModel>> result = new Result<>();
+        try {
+            List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId);
+            if (depIdModelList != null && depIdModelList.size() > 0) {
+                result.setSuccess(true);
+                result.setMessage("查找成功");
+                result.setResult(depIdModelList);
+            } else {
+                result.setSuccess(false);
+                result.setMessage("查找失败");
+            }
+            return result;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.setSuccess(false);
+            result.setMessage("查找过程中出现了异常: " + e.getMessage());
+            return result;
+        }
+
+    }
+
+    /**
+     * 用户管理页面重置密码
+     */
+    //@RequiresRoles({"admin"})
+    @RequiresPermissions("sys:user:resetpass")
+    @ApiOperation(value = "用户管理-页面重置密码")
+    @RequestMapping(value = "/updatePassword", method = RequestMethod.GET)
+    public Result<?> resetPassword(@RequestParam(name = "username") String username) {
+        SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
+        if (user == null) {
+            return Result.error("用户不存在！");
+        }
+        String password = PasswordUtil.encrypt(username, "nio.com123", user.getSalt());
+        this.sysUserService.update(new SysUser().setPassword(password), new LambdaQueryWrapper<SysUser>().eq(SysUser::getId, user.getId()));
+        return Result.OK("密码重置成功!");
+    }
+
+    /**
+     * 查询指定用户和角色关联的数据
+     * @param userid
+     * @return
+     */
+    @RequiresPermissions("sys:user:edit")
+    @ApiOperation(value = "用户管理-查询用户角色")
+    @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
+    public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
+        Result<List<String>> result = new Result<>();
+        List<String> list = new ArrayList<String>();
+        List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, userid));
+        if (userRole == null || userRole.size() <= 0) {
+            result.error500("未找到用户相关角色信息");
+        } else {
+            for (SysUserRole sysUserRole : userRole) {
+                list.add(sysUserRole.getRoleId());
+            }
+            result.setSuccess(true);
+            result.setResult(list);
+        }
+        return result;
+    }
+
 
     /**
      * 删除用户
@@ -334,25 +406,6 @@ public class SysUserController {
         return result;
     }
 
-    @RequiresPermissions("sys:user:edit")
-    @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
-    public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
-        Result<List<String>> result = new Result<>();
-        List<String> list = new ArrayList<String>();
-        List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, userid));
-        if (userRole == null || userRole.size() <= 0) {
-            result.error500("未找到用户相关角色信息");
-        } else {
-            for (SysUserRole sysUserRole : userRole) {
-                list.add(sysUserRole.getRoleId());
-            }
-            result.setSuccess(true);
-            result.setResult(list);
-        }
-        return result;
-    }
-
-
     /**
      * 校验用户账号是否唯一<br>
      * 可以校验其他 需要检验什么就传什么。。。
@@ -388,7 +441,6 @@ public class SysUserController {
      * 修改密码
      */
     //@RequiresRoles({"admin"})
-    @ApiOperation(value = "用户管理-修改密码")
     @RequiresPermissions("user:edit")
     @RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
     public Result<?> changePassword(@RequestBody SysUser sysUser) {
@@ -400,36 +452,6 @@ public class SysUserController {
         return sysUserService.changePassword(sysUser);
     }
 
-    /**
-     * 查询指定用户和部门关联的数据
-     *
-     * @param userId
-     * @return
-     */
-    @RequiresPermissions("sys:user:edit")
-    @RequestMapping(value = "/userDepartList", method = RequestMethod.GET)
-    public Result<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
-        Result<List<DepartIdModel>> result = new Result<>();
-        try {
-            List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId);
-            if (depIdModelList != null && depIdModelList.size() > 0) {
-                result.setSuccess(true);
-                result.setMessage("查找成功");
-                result.setResult(depIdModelList);
-            } else {
-                result.setSuccess(false);
-                result.setMessage("查找失败");
-            }
-            return result;
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.setSuccess(false);
-            result.setMessage("查找过程中出现了异常: " + e.getMessage());
-            return result;
-        }
-
-    }
-
     /**
      * 生成在添加用户情况下没有主键的问题,返回给前端,根据该id绑定部门数据
      *