From c4fb77c78f0617abdf117ca135dfee519f0bca51 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jan 2024 18:13:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/excel/GridmanExcel.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/excel/GridmanExcel.java b/src/main/java/org/springblade/modules/grid/excel/GridmanExcel.java
index 1129db8..de5891c 100644
--- a/src/main/java/org/springblade/modules/grid/excel/GridmanExcel.java
+++ b/src/main/java/org/springblade/modules/grid/excel/GridmanExcel.java
@@ -23,30 +23,24 @@
private static final long serialVersionUID = 1L;
@ColumnWidth(15)
- @ExcelProperty("社区名称")
+ @ExcelProperty("社区网格名称")
private String communityName;
@ColumnWidth(15)
- @ExcelProperty("网格名称")
- private String gridName;
+ @ExcelProperty("网格编号")
+ private String gridCode;
/**
* 网格员名称
*/
@ApiModelProperty(value = "网格员姓名")
private String gridmanName;
- /**
- * 手机号
- */
- @ApiModelProperty(value = "联系电话")
- private String mobile;
/**
- * 备注
+ * 网格员电话
*/
- @ColumnWidth(50)
- @ExcelProperty("备注")
- private String remark;
+ @ApiModelProperty(value = "网格员电话")
+ private String mobile;
}
--
Gitblit v1.9.3