diff --git a/bootdo/src/main/java/com/bootdo/system/controller/UserController.java b/bootdo/src/main/java/com/bootdo/system/controller/UserController.java
index 8c2c5ac19ec01420b39447774d70b3d37c75d9e1..02b686e39c529373d4fc1f547881495e0d47b775 100644
--- a/bootdo/src/main/java/com/bootdo/system/controller/UserController.java
+++ b/bootdo/src/main/java/com/bootdo/system/controller/UserController.java
@@ -178,7 +178,22 @@ public class UserController extends BaseController {
 		}
 
 	}
-	
+	@RequiresPermissions("sys:user:resetPwd")
+	@Log("admin提交更改用户密码")
+	@PostMapping("/adminResetPwd")
+	@ResponseBody
+	R adminResetPwd(UserVO userVO) {
+		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+		}
+		try{
+			userService.adminResetPwd(userVO);
+			return R.ok();
+		}catch (Exception e){
+			return R.error(1,e.getMessage());
+		}
+
+	}
 	@GetMapping("/tree")
 	@ResponseBody
 	public Tree<DeptDO> tree() {
diff --git a/bootdo/src/main/java/com/bootdo/system/service/UserService.java b/bootdo/src/main/java/com/bootdo/system/service/UserService.java
index e3430db43c88e41ff5cd1dc97b9813a842be0fda..da1b5003ff3ccefee17d0d2b2743339b68fe75c1 100644
--- a/bootdo/src/main/java/com/bootdo/system/service/UserService.java
+++ b/bootdo/src/main/java/com/bootdo/system/service/UserService.java
@@ -32,7 +32,7 @@ public interface UserService {
 	Set<String> listRoles(Long userId);
 
 	int resetPwd(UserVO userVO,UserDO userDO) throws Exception;
-
+	int adminResetPwd(UserVO userVO) throws Exception;
 	Tree<DeptDO> getTree();
 
 	/**
diff --git a/bootdo/src/main/java/com/bootdo/system/service/impl/UserServiceImpl.java b/bootdo/src/main/java/com/bootdo/system/service/impl/UserServiceImpl.java
index def9bf7b3fe43bc1c61e7616a0f857f8667b3ad9..507c74b4decea21bd20dfab0f2854e301cc24c7a 100644
--- a/bootdo/src/main/java/com/bootdo/system/service/impl/UserServiceImpl.java
+++ b/bootdo/src/main/java/com/bootdo/system/service/impl/UserServiceImpl.java
@@ -121,6 +121,17 @@ public class UserServiceImpl implements UserService {
 			throw new Exception("你修改的不是你登录的账号！");
 		}
 	}
+	@Override
+	public int adminResetPwd(UserVO userVO) throws Exception {
+		UserDO userDO =get(userVO.getUserDO().getUserId());
+		if("admin".equals(userDO.getUsername())){
+			throw new Exception("超级管理员的账号不允许直接重置！");
+		}
+		userDO.setPassword(MD5Utils.encrypt(userDO.getUsername(), userVO.getPwdNew()));
+		return userMapper.update(userDO);
+
+
+	}
 
 	@Transactional
 	@Override
diff --git a/bootdo/src/main/resources/templates/system/user/reset_pwd.html b/bootdo/src/main/resources/templates/system/user/reset_pwd.html
index 08ce46efb21504feec69822531f64776e030cb59..58683d4ee10573326aa409796a36cae5e9d36004 100644
--- a/bootdo/src/main/resources/templates/system/user/reset_pwd.html
+++ b/bootdo/src/main/resources/templates/system/user/reset_pwd.html
@@ -12,13 +12,13 @@
 
 				<div class="ibox-content">
 					<form class="form-horizontal m-t" id="signupForm">
-						<input id="userId" name="userId" th:value="${user.userId}"
+						<input id="userId" name="userDO.userId" th:value="${user.userId}"
 							type="hidden">
 						<div class="form-group">
 							<label class="col-sm-3 control-label">输入密码：</label>
 							<div class="col-sm-8">
-								<input id="password" name="password" class="form-control"
-									type="password" th:value="${user.password}">
+								<input id="password" name="pwdNew" class="form-control"
+									type="password" value="111111">
 							</div>
 						</div>
 						<div class="form-group">
@@ -63,7 +63,7 @@
 			$.ajax({
 				cache : true,
 				type : "POST",
-				url : "/sys/user/resetPwd",
+				url : "/sys/user/adminResetPwd",
 				data : $('#signupForm').serialize(),// 你的formid
 				async : false,
 				error : function(request) {