From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportRoomSMOImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportRoomSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportRoomSMOImpl.java
old mode 100644
new mode 100755
index 00ce3ae..7da0b73
--- a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportRoomSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportRoomSMOImpl.java
@@ -115,7 +115,7 @@
//鏌ヨ妤兼爧淇℃伅
JSONArray cars = this.getExistsCars(pd, result);
if (cars == null) {
- CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6);
+ CellRangeAddress region = new CellRangeAddress(0, 0, 0, 4);
sheet.addMergedRegion(region);
return;
}
@@ -128,7 +128,7 @@
row.createCell(4).setCellValue("");
}
- CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6);
+ CellRangeAddress region = new CellRangeAddress(0, 0, 0, 4);
sheet.addMergedRegion(region);
}
--
Gitblit v1.8.0