From 3095177ba8e0cc8b003314b24e56160aa8345d71 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 11 Feb 2025 18:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boot/manager/manager/utils/ImportNoPhotoExcelHelper.java    | 2 +-
 .../bonus/boot/manager/wages/service/impl/WagesServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java b/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java
index 9e994f1..f403ca3 100644
--- a/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java
+++ b/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java
@@ -193,7 +193,7 @@ public class ImportNoPhotoExcelHelper {
                         if (row.getRowNum() < 2) continue;
                         break;
                     case "WagesDetailsBean":
-                        if (row.getRowNum() < 6) continue;
+                        if (row.getRowNum() < 5) continue;
                         break;
                     case "CCBWagesDetailsBean":
                         if (row.getRowNum() < 1) continue;
diff --git a/src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java b/src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java
index cb457b1..77f999b 100644
--- a/src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java
+++ b/src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java
@@ -381,7 +381,7 @@ public class WagesServiceImpl implements WagesService {
         }
         // 导出标题
         ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter(true);
-        writer.merge(24, fileName,false);
+        writer.merge(25, fileName,false);
 
         // 合并二级表头
         writer.writeCellValue(0,1,"序号");