From f1337986b28a2a0b26f35eabc4edb0ddd2d551c6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 07 十一月 2023 17:25:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
index 7272b62..48bb7c8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
@@ -524,6 +524,7 @@
if (ed.isMerged() && (ed.getRowTo() > ed.getRow() || ed.getColTo() > ed.getCol())) {
mergedDataList.add(ed);
}
+ // TODO: 淇敼缂栧彿鍒椾负鏂囨湰
if("id".equalsIgnoreCase(ed.getObjCode())){
//CellStyle textStyle = workbook.createCellStyle();
HSSFDataFormat format = (HSSFDataFormat)sheet.getWorkbook().createDataFormat();
--
Gitblit v1.9.3