修改新增密码和重置密码不一致的bug

zksy-admin/src/main/java/com/zksy/web/controller/system/SysUserController.java

@@ -153,7 +153,7 @@ public class SysUserController extends BaseController {
         }
         user.setCreateTime(new Date());
         user.setCreateBy(getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(getPwd4UserName(user)));
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.insertUser(user));
     }
 

zksy-system/src/main/java/com/zksy/system/service/impl/SysUserServiceImpl.java

@@ -402,7 +402,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public int resetPwd(SysUser user) {
         return userMapper.updateUser(user);
     }
-
     /**
      * 重置用户密码
      *