Merge remote-tracking branch 'origin/master'

ZQN

2024-08-27 69155f0115473d6c17bb7441bc1c7b06e05173ef

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

@@ -151,4 +151,6 @@
     * @return 结果
     */
    int resetPhone(@Param("userId")Long userId, @Param("phone")String phone);

    List<SysUser> selectUserListCommon(SysUser user);
}