From 7460e238b4f433a3f24d7a20c58372a9989ec65e Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 31 十月 2024 10:12:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
index 52ab560..f3d796e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
@@ -200,15 +200,15 @@
/**
* 淇敼瀵嗙爜
- * @param userOid 鐢ㄦ埛涓婚敭
+ * @param userName 鐢ㄦ埛鍚�
* @param password 鏂板瘑鐮�
* @param confirmPassword 纭瀵嗙爜
*/
@RequestMapping(value = "/changePassword",method = RequestMethod.POST)
@VciUnCheckRight
- public BaseResult changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException {
+ public BaseResult changePassword(String userName,String oldPassword, String password, String confirmPassword) throws PLException {
try {
- return userQueryService.changePassword(userOid, oldPassword, password, confirmPassword) ? BaseResult.success(true,"鐢ㄦ埛淇敼鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛淇敼澶辫触锛�");
+ return userQueryService.changePassword(userName, oldPassword, password, confirmPassword) ? BaseResult.success(true,"鐢ㄦ埛淇敼鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛淇敼澶辫触锛�");
}catch (Exception e){
e.printStackTrace();
String exceptionMessage = "淇敼瀵嗙爜鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
--
Gitblit v1.9.3