From ec759e2c4e9340a1f447dec93ce4742c1c8c132a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 15:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 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