diff --git a/pom.xml b/pom.xml
index 1aed98d0..f7420c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,8 @@
3.1.2
3.4.2
7.2.18
- 4.0.0
+ 4.1.0
+ 4.1.0
2.0.6
1.7
1.10
@@ -225,26 +226,20 @@
qiniu-java-sdk
${qiniu-java-sdk}
-
- cn.afterturn
- easypoi-base
- ${easypoi.version}
-
-
- com.google.guava
- guava
-
-
+ org.apache.poi
+ poi
+ ${poi.version}
- cn.afterturn
- easypoi-web
- ${easypoi.version}
+ org.apache.poi
+ poi-ooxml
+ ${poi.version}
+
cn.afterturn
- easypoi-annotation
+ easypoi-base
${easypoi.version}
diff --git a/zlt-business/user-center/pom.xml b/zlt-business/user-center/pom.xml
index edbef366..e6361cc0 100644
--- a/zlt-business/user-center/pom.xml
+++ b/zlt-business/user-center/pom.xml
@@ -63,15 +63,6 @@
mysql-connector-java
-
- cn.afterturn
- easypoi-web
-
-
- cn.afterturn
- easypoi-annotation
-
-
io.micrometer
micrometer-registry-prometheus
diff --git a/zlt-business/user-center/src/main/java/com/central/user/model/SysUserExcel.java b/zlt-business/user-center/src/main/java/com/central/user/model/SysUserExcel.java
index d406fdd9..aae7e286 100644
--- a/zlt-business/user-center/src/main/java/com/central/user/model/SysUserExcel.java
+++ b/zlt-business/user-center/src/main/java/com/central/user/model/SysUserExcel.java
@@ -24,7 +24,7 @@ public class SysUserExcel implements Serializable {
@Excel(name = "手机号码", height = 20, width = 30, isImportField = "true_st")
private String mobile;
- @Excel(name = "学生性别", replace = { "男_0", "女_1" }, suffix = "生", isImportField = "true_st")
+ @Excel(name = "性别", replace = { "男_0", "女_1" }, isImportField = "true_st")
private Integer sex;
@Excel(name = "创建时间", format = CommonConstant.DATETIME_FORMAT, isImportField = "true_st", width = 20)
diff --git a/zlt-commons/zlt-common-spring-boot-starter/pom.xml b/zlt-commons/zlt-common-spring-boot-starter/pom.xml
index 2f20cb2c..71a3e87f 100644
--- a/zlt-commons/zlt-common-spring-boot-starter/pom.xml
+++ b/zlt-commons/zlt-common-spring-boot-starter/pom.xml
@@ -54,6 +54,14 @@
spring-cloud-starter-openfeign
true
+
+ org.apache.poi
+ poi
+
+
+ org.apache.poi
+ poi-ooxml
+
cn.afterturn
diff --git a/zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/utils/ExcelUtil.java b/zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/utils/ExcelUtil.java
index 210a66ab..6c89841a 100644
--- a/zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/utils/ExcelUtil.java
+++ b/zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/utils/ExcelUtil.java
@@ -42,7 +42,7 @@ private ExcelUtil() {
*/
public static void exportExcel(List> list, String title, String sheetName, Class> pojoClass, String fileName
, boolean isCreateHeader, HttpServletResponse response) throws IOException {
- ExportParams exportParams = new ExportParams(title, sheetName);
+ ExportParams exportParams = new ExportParams(title, sheetName, ExcelType.XSSF);
exportParams.setCreateHeadRows(isCreateHeader);
defaultExport(list, pojoClass, fileName, response, exportParams);
@@ -61,7 +61,7 @@ public static void exportExcel(List> list, String title, String sheetName, Cla
*/
public static void exportExcel(List> list, String title, String sheetName, Class> pojoClass, String fileName
, HttpServletResponse response) throws IOException {
- defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName));
+ defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF));
}
/**
@@ -93,7 +93,7 @@ private static void defaultExport(List