From bbb5cd29f2cfce81cbea2170c0d5b88c761c19f0 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 27 Nov 2020 10:34:19 +0800 Subject: [PATCH] 1127 --- mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 1 + mt/src/main/resources/application.yml | 4 ++-- tall/src/main/resources/application.yml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 084db735..868a23e4 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -644,6 +644,7 @@ public class ExcelService implements IExcelService { three1 = new PoiUtil.PoiUtilCell(project.getStartTime(), 1, j); three2 = new PoiUtil.PoiUtilCell(project.getProjectName(), 1, j); q++; + } else { three1 = new PoiUtil.PoiUtilCell(); three2 = new PoiUtil.PoiUtilCell(); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index ac92adb9..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index e75cc2c3..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: prod - include: util-prod,common + active: dev + include: util-dev,common