From ad047e06bdfa5ee222080cb357403dc34fbc0f50 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 13 May 2021 21:04:50 +0800
Subject: [PATCH] 1.desk,service,user 模块 pom依赖修改 2.新增 blade-onenetstudio 模块，集成onenetstudio 基于MQTT协议的sdk,实现设备的属性上报功能

---
 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