From c6941df7cc7b5572018dd579f1e7c88b42dcd9bb Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Tue, 24 Dec 2024 16:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E4=B8=93?=
 =?UTF-8?q?=E5=8C=BA=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/xlsx/ActivityZoneService.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/common/service/xlsx/ActivityZoneService.php b/app/common/service/xlsx/ActivityZoneService.php
index f0d0b6b83..8971f3fa0 100644
--- a/app/common/service/xlsx/ActivityZoneService.php
+++ b/app/common/service/xlsx/ActivityZoneService.php
@@ -74,14 +74,10 @@ class ActivityZoneService
         }
         $count = count($data);
         $sheet->mergeCells('A' . ($count + 7) . ':F' . ($count + 7));
-        $sheet->setCellValue('A' . ($count + 7), "专区类型：{$typeName}");
-        $sheet->mergeCells('A' . ($count + 8) . ':F' . ($count + 8));
-        $sheet->setCellValue('A' . ($count + 8), "");
-        $sheet->mergeCells('A' . ($count + 9) . ':F' . ($count + 9));
-        $sheet->setCellValue('A' . ($count + 9), "备注：{$remark}");
-        $sheet->getRowDimension($count + 9)->setRowHeight(50);
-        $sheet->getStyle('A' . ($count + 9))->getAlignment()->setWrapText(true);
-        $sheet->getStyle('A' . ($count + 7). ':' . 'F' . ($count + 9))->applyFromArray($leftStyle);
+        $sheet->setCellValue('A' . ($count + 7), "备注：{$remark}");
+        $sheet->getRowDimension($count + 7)->setRowHeight(50);
+        $sheet->getStyle('A' . ($count + 7))->getAlignment()->setWrapText(true);
+        $sheet->getStyle('A' . ($count + 7). ':' . 'F' . ($count + 7))->applyFromArray($leftStyle);
 
         // 设置单元格的样式
         $styleArray = [