From 977444532d644d48b5b55ca89a1e3d62b5dd8782 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 19 May 2021 17:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java
index 50697bb..3f25669 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java
@@ -51,8 +51,10 @@
@ExcelProperty("部门")
private String department;
- @ColumnWidth(10)
- @ExcelProperty("天气")
+ /**
+ * 天气，忽略不显示
+ */
+ @ExcelIgnore
private String weather;
@ColumnWidth(20)
--
Gitblit v1.9.3