diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
index 7e00d52..eedfc9c 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
@@ -87,4 +87,11 @@ public class UserController {
             return ElectromagneticResultUtil.fail("500", "不可绑定空用户");
         }
     }
+
+    @ApiOperation(value = "密码重置", notes = "")
+    @GetMapping(value = "/resetPassword/{userId}")
+    public ElectromagneticResult<?> resetPassword(@PathVariable("userId") String userId) {
+        return ElectromagneticResultUtil.success(userService.resetPassword(userId));
+    }
+
 }
\ No newline at end of file
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java
index 49f4527..4f0e9a7 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java
@@ -82,4 +82,10 @@ public interface UserService {
      * 人员绑定
      */
     Boolean bindRoles(UserRoleRequest userRoleRequest);
+
+    /**
+     * 重置密码
+     * @param userId
+     */
+    Boolean resetPassword(String userId);
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
index 13133b2..138e5f8 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
@@ -34,6 +34,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -276,6 +277,18 @@ public class UserServiceImpl implements UserService {
         return Boolean.TRUE;
     }
 
+    /**
+     * 重置密码
+     * @param userId
+     */
+    @Override
+    @Transactional
+    public Boolean resetPassword(String userId) {
+        User user = userMapper.getSingleUser(userId);
+        user.setUserPwd(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD + user.getSalt()));
+        return userMapper.modify(user)>0;
+    }
+
     private void activeRole (UserBindRoleDTO dto) {
         User user = userMapper.getSingleUser(dto.getUserId());
         if (user.getIsActivated().equals(ActiveEnum.UNACTIVATED.getCode())) {
diff --git a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml
index a2931e6..96b3eda 100644
--- a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml
+++ b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml
@@ -100,6 +100,7 @@
             <if test="joinTime != null">join_time = #{joinTime},</if>
             <if test="userStatus != null and userStatus != ''">user_status = #{userStatus},</if>
             <if test="isActivated != null and isActivated != ''">is_activated = #{isActivated},</if>
+            <if test="userPwd != null and userPwd != ''">user_pwd = #{userPwd},</if>
             internship_end_date = #{internshipEndDate},
             <if test="modifier != null and modifier != ''">modifier = #{modifier},</if>
             <if test="modifierName != null and modifierName != ''">modifier_name = #{modifierName},</if>