From 1fa18d4c61c6facb52fe09168dcbf6b46de4aafe Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 28 八月 2024 15:20:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
index 865899f..139b5d8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
@@ -1,13 +1,11 @@
 package com.vci.frameworkcore.compatibility;
 
+import com.vci.dto.SmUserDTO;
 import com.vci.corba.common.PLException;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.SmUserVO;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
@@ -193,10 +191,11 @@
     /**
      * 淇敼瀵嗙爜
      * @param userOid 鐢ㄦ埛涓婚敭
+     * @param oldPassword 鏃х殑瀵嗙爜
      * @param password 鏂扮殑瀵嗙爜
      * @param confirmPassword 纭瀵嗙爜
      */
-    void changePassword(String userOid, String password, String confirmPassword) throws VciBaseException;
+    boolean changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws Exception;
 
     /**
      * 鏇存柊鐢ㄦ埛鐨勫瘑鐮侀敊璇鏁�

--
Gitblit v1.9.3