From b7feda7c2cc54e03966ecbd2ed2582097eb3ee73 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:24:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w
---
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