From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/excel/PoliceUserExcel.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/excel/PoliceUserExcel.java b/src/main/java/org/springblade/modules/system/excel/PoliceUserExcel.java
index 7dbc5c9..071a4f1 100644
--- a/src/main/java/org/springblade/modules/system/excel/PoliceUserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/PoliceUserExcel.java
@@ -24,16 +24,20 @@
@ExcelProperty("姓名")
private String realName;
+ @ColumnWidth(10)
+ @ExcelProperty("性别")
+ private String sex;
+
@ColumnWidth(15)
- @ExcelProperty("手机")
+ @ExcelProperty("联系电话")
private String phone;
@ColumnWidth(15)
- @ExcelProperty("社区代码")
- private String communityCode;
+ @ExcelProperty("工作单位")
+ private String deptName;
@ColumnWidth(15)
- @ExcelProperty("派出所名称")
- private String policeStationName;
+ @ExcelProperty("角色")
+ private String roleName;
}
--
Gitblit v1.9.3