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/AlarmExcel.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java b/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
index ca944c7..0347e13 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/AlarmExcel.java
@@ -1,5 +1,6 @@
package org.springblade.common.entity;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -42,8 +43,9 @@
private String galarmPeople;
- @ColumnWidth(15)
- @ExcelProperty("性别(0:男,1:女)")
+// @ColumnWidth(15)
+// @ExcelProperty("性别(0:男,1:女)")
+ @ExcelIgnore
private String sex;
@@ -83,13 +85,15 @@
private String district;
- @ColumnWidth(10)
- @ExcelProperty("省份")
+// @ColumnWidth(10)
+// @ExcelProperty("省份")
+ @ExcelIgnore
private String province;
- @ColumnWidth(10)
- @ExcelProperty("地市")
+// @ColumnWidth(10)
+// @ExcelProperty("地市")
+ @ExcelIgnore
private String city;
@@ -117,8 +121,9 @@
private String wd;
- @ColumnWidth(10)
- @ExcelProperty("是否生成警单(0:否 1：是)")
+// @ColumnWidth(10)
+// @ExcelProperty("是否生成警单(0:否 1：是)")
+ @ExcelIgnore
private String jtype;
@ColumnWidth(20)
--
Gitblit v1.9.3