diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
index 251b4b229716988a7183e3433aa64e0ce51d2d02..0430a3f613b89091dc6cac9eaa060684277c9f7a 100644
--- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
+++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
@@ -15,6 +15,7 @@
  */
 package com.jeequan.jeepay.mgr.ctrl;
 
+import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jeequan.jeepay.core.aop.MethodLog;
@@ -118,14 +119,14 @@ public class CurrentUserController extends CommonCtrl{
 	@MethodLog(remark = "修改密码")
 	public ApiRes modifyPwd() throws BizException{
 
-		//更改密码， 验证当前用户信息
-		String currentUserPwd = getValStringRequired("originalPwd"); //当前用户登录密码
+		//更改密码，验证当前用户信息
+		String currentUserPwd = Base64.decodeStr(getValStringRequired("originalPwd")); //当前用户登录密码
 		//验证当前密码是否正确
 		if(!sysUserAuthService.validateCurrentUserPwd(currentUserPwd)){
 			throw new BizException("原密码验证失败！");
 		}
 
-		String opUserPwd = getValStringRequired("confirmPwd");
+		String opUserPwd = Base64.decodeStr(getValStringRequired("confirmPwd"));
 
 		// 验证原密码与新密码是否相同
 		if (opUserPwd.equals(currentUserPwd)) {
diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java
index 51989df36704c889c8e60392af1042ba7f786277..ae4f19c489af6d35d368e1474ac46f7b0747465b 100644
--- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java
+++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java
@@ -15,6 +15,7 @@
  */
 package com.jeequan.jeepay.mch.ctrl;
 
+import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jeequan.jeepay.core.aop.MethodLog;
@@ -124,14 +125,14 @@ public class CurrentUserController extends CommonCtrl{
 
 		Long opSysUserId = getValLongRequired("recordId");   //操作员ID
 
-		//更改密码， 验证当前用户信息
-		String currentUserPwd = getValStringRequired("originalPwd"); //当前用户登录密码
+		//更改密码，验证当前用户信息
+		String currentUserPwd = Base64.decodeStr(getValStringRequired("originalPwd")); //当前用户登录密码
 		//验证当前密码是否正确
 		if(!sysUserAuthService.validateCurrentUserPwd(currentUserPwd)){
 			throw new BizException("原密码验证失败！");
 		}
 
-		String opUserPwd = getValStringRequired("confirmPwd");
+		String opUserPwd = Base64.decodeStr(getValStringRequired("confirmPwd"));
 
 		// 验证原密码与新密码是否相同
 		if (opUserPwd.equals(currentUserPwd)) {
diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
index dbf2d879250f01dffeed0af43244ad05839ba95d..1df5a2ee093686738d11a368ae33c556dde6c39f 100644
--- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
+++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
@@ -153,7 +153,7 @@ public class SysUserController extends CommonCtrl {
 		Boolean resetPass = getReqParamJSON().getBoolean("resetPass");
 		if (resetPass != null && resetPass) {
 			//判断是否重置密码
-			String updatePwd = getReqParamJSON().getBoolean("defaultPass") == false? Base64.decodeStr(getValStringRequired("confirmPwd")):CS.DEFAULT_PWD;
+			String updatePwd = getReqParamJSON().getBoolean("defaultPass") == false ? Base64.decodeStr(getValStringRequired("confirmPwd")) : CS.DEFAULT_PWD;
 			sysUserAuthService.resetAuthInfo(sysUser.getSysUserId(), null, null, updatePwd, CS.SYS_TYPE.MCH);
 			// 删除用户redis缓存信息
 			authService.delAuthentication(Arrays.asList(recordId));