From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java b/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
index ff94371..8d27d3a 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/HealthcodeExcel.java
@@ -5,6 +5,7 @@
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
+import org.springblade.common.converter.HealthcodeTypeConverter;
@Data
@@ -20,7 +21,7 @@
@ColumnWidth(15)
- @ExcelProperty("类型(1:绿色 2:黄色 3:红色)")
+ @ExcelProperty(value = "类型",converter = HealthcodeTypeConverter.class)
private String type;
--
Gitblit v1.9.3