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

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 072eb64..e773b0e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -48,6 +48,7 @@
      * @return 用户对象信息
      */
     SysUser selectUserByUserName(String userName);
+    SysUser selectUserShopByUserName(String userName);
 
     /**
      * 通过用户ID查询用户
@@ -90,6 +91,7 @@
      * @return 结果
      */
     int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
+    int resetUserShopPwd(@Param("userName") String userName, @Param("password") String password);
 
     /**
      * 通过用户ID删除用户

--
Gitblit v1.7.1