Merge remote-tracking branch 'origin/master'

无关风月

2025-06-17 f6564b610b382c6c78f0e1cb231c60ea6cf543ef

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

@@ -171,9 +171,11 @@

    List<SysUser> selectAllList();

    List<SysUserVO> pageList(@Param("query")SysUserQuery query, @Param("pageInfo")PageInfo<SysUserVO> pageInfo);
    List<SysUserVO> pageList(@Param("query")SysUserQuery query);

    void updatePassword(@Param("id") Long id,@Param("s") String s);

    long selectIdByPhone(@Param("phonenumber") String phonenumber);

    List<SysUser> selectUserByTempLateId(@Param("templateId")String templateId);
}