From b950959d695e4f8c53bbfa26d807145a8af31119 Mon Sep 17 00:00:00 2001
From: jinsir <874871581@qq.com>
Date: Thu, 20 Nov 2025 08:24:49 +0800
Subject: [PATCH 1/2] news

---
 app/routes/news.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index 466d68f..da46f27 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -14,10 +14,6 @@ import { Hotline } from "@/components/news/body/FireNews/Hotline";
 import { AutoCarouselDemo } from "@/components/AutoCarousel";
 import { Footer } from "@/components/news/footer/footer";
 import { CarouselDemo } from "@/components/Carousel";
-<<<<<<< HEAD
-=======
-
->>>>>>> c14daff3c048d7b97f1a2e62ab201d234aaf0e77
 
 export function meta( ) {
   return [

From 55c4dfd796386cc72e24ce5a26d76910109a0b06 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Thu, 20 Nov 2025 08:29:49 +0800
Subject: [PATCH 2/2] 1

---
 app/components/Carousel.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/components/Carousel.tsx b/app/components/Carousel.tsx
index b4fceb5..da0724e 100755
--- a/app/components/Carousel.tsx
+++ b/app/components/Carousel.tsx
@@ -115,10 +115,10 @@ export function CarouselDemo({
         </CarouselContent>
 
         {/* 上一张按钮（左箭头） */}
-        <CarouselPrevious className="absolute left-2 top-1/2 -translate-y-1/2 z-10" />
+        {/* <CarouselPrevious className="absolute left-2 top-1/2 -translate-y-1/2 z-10" /> */}
 
         {/* 下一张按钮（右箭头） */}
-        <CarouselNext className="absolute right-2 top-1/2 -translate-y-1/2 z-10" />
+        {/* <CarouselNext className="absolute right-2 top-1/2 -translate-y-1/2 z-10" /> */}
       </Carousel>
 
       {/* 分页指示器容器：绝对定位在底部 */}