From be7a263801a25b2f2bdff574689042abcc8f0a8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 16 一月 2025 17:02:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 776f124..f69a56a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -184,6 +184,7 @@
* @return 结果
*/
int resetUserPwd(String userName, String password);
+ int resetUserShopPwd(String userName, String password);
/**
* 通过用户ID删除用户
@@ -199,7 +200,7 @@
* @param userIds 需要删除的用户ID
* @return 结果
*/
- int deleteUserByIds(Long[] userIds);
+ void deleteUserByIds(Long[] userIds);
/**
* 导入用户数据
--
Gitblit v1.7.1