diff --git a/pom.xml b/pom.xml index 21b355a2..cf86db46 100644 --- a/pom.xml +++ b/pom.xml @@ -164,6 +164,7 @@ 0.7.0 + com.fasterxml.jackson.dataformat diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index f005f921..8ad84bba 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -640,8 +640,8 @@ public class PoiUtil { PoiUtilCell poiUtilCell = new PoiUtilCell(); poiUtilCell.setValue("111222333"); - poiUtilCell.setColspan(2); - poiUtilCell.setRowspan(1); + /*poiUtilCell.setColspan(2); + poiUtilCell.setRowspan(1);*/ PoiUtilCell poiUtilCell1 = new PoiUtilCell(); poiUtilCell1.setValue("1112222"); PoiUtilCell poiUtilCell3 = new PoiUtilCell(); @@ -649,7 +649,7 @@ public class PoiUtil { PoiUtilCell poiUtilCell2 = new PoiUtilCell(); poiUtilCell2.setValue(""); - poiUtilCell2.setFunction("SUM(A1:C1)"); + //poiUtilCell2.setFunction("SUM(A1:C1)"); List cells = new ArrayList<>();