From aa72ef0c709ea6f7196403a58a42f6de090beb3e Mon Sep 17 00:00:00 2001
From: qiuchenfan <2035024011@qq.com>
Date: Tue, 18 Nov 2025 17:44:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86header=E7=BB=84=E4=BB=B6=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0news/header=E4=B8=8B=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/{ => news}/header/Header.tsx | 0
 app/components/{ => news}/header/TopNav.tsx | 0
 app/routes/news.tsx                         | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename app/components/{ => news}/header/Header.tsx (100%)
 rename app/components/{ => news}/header/TopNav.tsx (100%)

diff --git a/app/components/header/Header.tsx b/app/components/news/header/Header.tsx
similarity index 100%
rename from app/components/header/Header.tsx
rename to app/components/news/header/Header.tsx
diff --git a/app/components/header/TopNav.tsx b/app/components/news/header/TopNav.tsx
similarity index 100%
rename from app/components/header/TopNav.tsx
rename to app/components/news/header/TopNav.tsx
diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index 60a2a4a..b8d524d 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -2,8 +2,8 @@ import { CarouselDemo } from "@/components/Carousel";
 import type { Route } from "./+types/news";
 import Integrated from "@/components/news/body/Integrated";
 import CultureBgPage from "@/components/news/body/Culturebg";
-import {Header} from "@/components/header/Header";
-import {TopNav} from "@/components/header/TopNav";
+import {Header} from "@/components/news/header/Header";
+import {TopNav} from "@/components/news/header/TopNav";
 import NewsList from "@/components/list/NewsList";
 import ImageGridSection from "@/components/body/ImageGridSection";
 export function meta( ) {

From 132d005bb1b76ac9dcda95c56560920fba0d0e8c Mon Sep 17 00:00:00 2001
From: qiuchenfan <2035024011@qq.com>
Date: Tue, 18 Nov 2025 17:46:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E8=AF=A5=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/routes/news.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index 6d132a5..c7e1696 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -5,12 +5,9 @@ import CultureBgPage from "@/components/news/body/Culturebg";
 import {Header} from "@/components/news/header/Header";
 import {TopNav} from "@/components/news/header/TopNav";
 import NewsList from "@/components/list/NewsList";
-<<<<<<< HEAD
 import ImageGridSection from "@/components/body/ImageGridSection";
 import { CarouselDemo } from "@/components/Carousel";
-=======
 import GrassrootsDynamics from "@/components/body/GrassrootsDynamics";
->>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8
 export function meta( ) {
   return [
     { title: "New React Router App" },
@@ -26,12 +23,9 @@ export default function Home() {
       <TopNav />
       <CarouselDemo />
       <NewsList />
-<<<<<<< HEAD
       <ImageGridSection />
-      {/* <Integrated /> */}
+      <Integrated />
       <CultureBgPage />
-=======
->>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8
     </div>
   );
 }