From 813b80aeea6829d082d6461da33894a99f07edba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 May 2021 14:47:49 +0800
Subject: [PATCH] 1.新增根据用户编号查询用户信息接口 2.修复考勤导出信息中考勤类型缺失bug
---
blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java b/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
index 268d2d9..32417be 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
@@ -6,7 +6,9 @@
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import org.springblade.common.converter.ListToStringConverter;
+import org.springblade.common.converter.ParcelMarkConverter;
+import java.io.Serializable;
import java.util.List;
/**
@@ -17,7 +19,7 @@
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
-public class ParcelExcel {
+public class ParcelExcel implements Serializable {
@ColumnWidth(20)
@ExcelProperty("安检机所在地")
@@ -48,7 +50,7 @@
private String samplingTime;
@ColumnWidth(20)
- @ExcelProperty("是否识别违禁, 1-违禁 0-非违禁")
+ @ExcelProperty(value = "是否识别违禁",converter = ParcelMarkConverter.class)
private String mechineMark;
@ColumnWidth(50)
--
Gitblit v1.9.3