From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/excel/InforExcel.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/excel/InforExcel.java b/src/main/java/org/springblade/modules/information/excel/InforExcel.java
index 0c8571a..1d4e158 100644
--- a/src/main/java/org/springblade/modules/information/excel/InforExcel.java
+++ b/src/main/java/org/springblade/modules/information/excel/InforExcel.java
@@ -60,7 +60,7 @@
@ColumnWidth(15)
@ExcelProperty("成立日期")
- private String establishtime;
+ private Date establishtime;
@ColumnWidth(10)
@ExcelProperty("注册资本")
@@ -100,7 +100,7 @@
private String industry;
@ColumnWidth(20)
- @ExcelProperty("类型")
+ @ExcelProperty("企业类型(自招保安单位/保安培训公司/保安服务公司/武装守押公司)")
private String stats;
--
Gitblit v1.9.3