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/resources/mapping/system/SysUserMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
index 8aa82dc..fc40357 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
@@ -268,7 +268,10 @@
 	</update>
 	
 	<update id="resetUserPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
- 		update sys_user set password = #{password} where user_name = #{userName}
+ 		update sys_user set password = #{password} where user_name = #{userName} and role_type =1
+	</update>
+	<update id="resetUserShopPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
+ 		update sys_user set password = #{password} where user_name = #{userName} and role_type =2
 	</update>
 	
 	<update id="deleteUserById" parameterType="Long">

--
Gitblit v1.7.1