diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
index bbb842f..f7fbf22 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
@@ -197,6 +197,13 @@ public class UserController extends BaseController {
         user.setStatus(null);
         user.setUsername(null);
         user.setPassword(null);
+        if (user.getPassword() != null) {
+            String pwd = userService.encodePassword(user.getPassword());
+            User originData = userService.getByIdRel(user.getUserId());
+            if(!pwd.equals(originData.getPassword())) {
+                user.setPassword(pwd);
+            }
+        }
         if (userService.updateUser(user)) {
             return success("修改成功");
         }