From d038de035ab444c9eb8e04538d74e2d810b8fe7e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 15:46:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java |    4 +++-
 1 files changed, 3 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 d6a88df..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
@@ -47,6 +47,7 @@
      * @return 用户对象信息
      */
     SysUser selectUserByUserName(String userName);
+    SysUser selectUserShopByUserName(String userName);
 
     /**
      * 通过用户ID查询用户
@@ -183,6 +184,7 @@
      * @return 结果
      */
     int resetUserPwd(String userName, String password);
+    int resetUserShopPwd(String userName, String password);
 
     /**
      * 通过用户ID删除用户
@@ -198,7 +200,7 @@
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    int deleteUserByIds(Long[] userIds);
+    void deleteUserByIds(Long[] userIds);
 
     /**
      * 导入用户数据

--
Gitblit v1.7.1