From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index c9ce1a1..eb55e1a 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -1199,7 +1199,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("琚繚闄╀汉");
header1.createCell(3).setCellValue("");
@@ -1351,7 +1351,7 @@
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,6));
Row header1 = sheet.createRow(1);
header1.setHeight((short) 500);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("琚繚闄╀汉");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
@@ -1459,7 +1459,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("");
@@ -1623,7 +1623,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("淇濋櫓鏂规");
header1.createCell(2).setCellValue("淇濆崟鍙�");
header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
@@ -1847,7 +1847,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("淇濋櫓鏂规");
header1.createCell(2).setCellValue("淇濆崟鍙�");
header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
@@ -2016,7 +2016,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("");
--
Gitblit v1.9.3