From f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/ShopInfoService.java | 9 ++++++++-
1 files changed, 8 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..b569e27 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,16 @@
* 闂ㄥ簵淇敼瀵嗙爜
*
* @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);
+
+ /**
+ * 缁存姢闂ㄥ簵鎵撳嵃鏈篠N
+ * @param dto 闂ㄥ簵鎵撳嵃鏈虹淮鎶よ姹�
+ */
+ void maintainPrinterSn(ShopPrinterDTO dto);
}
--
Gitblit v1.9.3