From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/excel/GridmanExcel.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 de5891c..ab4c16f 100644
--- a/src/main/java/org/springblade/modules/grid/excel/GridmanExcel.java
+++ b/src/main/java/org/springblade/modules/grid/excel/GridmanExcel.java
@@ -23,24 +23,27 @@
private static final long serialVersionUID = 1L;
@ColumnWidth(15)
- @ExcelProperty("社区网格名称")
+ @ExcelProperty("社区名称")
private String communityName;
+ @ColumnWidth(15)
+ @ExcelProperty("社区编号")
+ private String communityCode;
+
+ @ColumnWidth(15)
+ @ExcelProperty("网格名称")
+ private String gridName;
@ColumnWidth(15)
@ExcelProperty("网格编号")
private String gridCode;
- /**
- * 网格员名称
- */
- @ApiModelProperty(value = "网格员姓名")
+ @ColumnWidth(15)
+ @ExcelProperty("网格员姓名")
private String gridmanName;
- /**
- * 网格员电话
- */
- @ApiModelProperty(value = "网格员电话")
+ @ColumnWidth(15)
+ @ExcelProperty("网格员电话")
private String mobile;
}
--
Gitblit v1.9.3