Merge remote-tracking branch 'origin/master'

xuhy

2025-01-17 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -91,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删除用户