From f615ec5c9239327740948501627545f8e78e2a9e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 09:07:26 +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, 3 insertions(+), 0 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 5e980b4..a7621e8 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
@@ -81,6 +81,8 @@
      */
     boolean checkUserNameUnique(SysUser user);
 
+    boolean checkNickNameUnique(SysUser user);
+
     /**
      * 校验手机号码是否唯一
      *
@@ -184,6 +186,7 @@
      * @return 结果
      */
     int resetUserPwd(String userName, String password);
+    int resetUserShopPwd(String userName, String password);
 
     /**
      * 通过用户ID删除用户

--
Gitblit v1.7.1