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/mapper/SysUserMapper.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..dd687f3 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删除用户
@@ -110,18 +112,19 @@
/**
* 校验用户名称是否唯一
*
- * @param userName 用户名称
* @return 结果
*/
- SysUser checkUserNameUnique(String userName);
+ SysUser checkUserNameUnique(SysUser user);
+
+
+ SysUser checkNickNameUnique(SysUser sysUser);
/**
* 校验手机号码是否唯一
*
- * @param phonenumber 手机号码
* @return 结果
*/
- SysUser checkPhoneUnique(String phonenumber);
+ SysUser checkPhoneUnique(SysUser sysUser);
--
Gitblit v1.7.1