From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/service/business/ShopInfoService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/ShopInfoService.java b/server/services/src/main/java/com/doumee/service/business/ShopInfoService.java
index c4d64e7..be2b405 100644
--- a/server/services/src/main/java/com/doumee/service/business/ShopInfoService.java
+++ b/server/services/src/main/java/com/doumee/service/business/ShopInfoService.java
@@ -213,9 +213,10 @@
      * 闂ㄥ簵淇敼瀵嗙爜
      *
      * @param shopId      闂ㄥ簵涓婚敭
+     * @param oldPassword 鏃у瘑鐮�
      * @param newPassword 鏂板瘑鐮�
      * @param token       褰撳墠token锛堜慨鏀规垚鍔熷悗娓呴櫎锛�
      */
-    void changePassword(Integer shopId, String newPassword, String token);
+    void changePassword(Integer shopId, String oldPassword, String newPassword, String token);
 
 }

--
Gitblit v1.9.3