合并冲突问题

src/pages/list/index.tsx

@@ -6,7 +6,6 @@ import Menu from "../../components/Menu/example";
 import CityFilter from "../../components/CityFilter/example";
 import SearchBar from "../../components/SearchBar";
 import FilterPopup from "./FilterPopup";
-import "./index.scss";
 import { useEffect } from "react";
 import Taro from "@tarojs/taro";
 import {
@@ -16,6 +15,7 @@ import {
   useTennisLastRefresh,
   useTennisActions,
 } from "../../store/listStore";
+import "./index.scss";
 
 const ListPage = () => {
   // 从 store 获取数据和方法