From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 81 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/excel/UserExcel.java b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
index 7ab06b3..dd72e7c 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -38,60 +38,65 @@
public class UserExcel implements Serializable {
private static final long serialVersionUID = 1L;
- @ColumnWidth(15)
- @ExcelProperty("保安单位编号")
- private String tenantId;
+// @ColumnWidth(15)
+// @ExcelProperty("账号")
+// private String account;
- @ExcelIgnore
- @ExcelProperty("用户平台")
- private String userType;
-
- @ColumnWidth(20)
- @ExcelProperty("用户平台名称")
- private String userTypeName;
-
- @ColumnWidth(15)
- @ExcelProperty("账户")
- private String account;
+ @ExcelProperty("单位名称*")
+ private String deptId;
@ColumnWidth(10)
- @ExcelProperty("昵称")
- private String name;
-
- @ColumnWidth(10)
- @ExcelProperty("姓名")
+ @ExcelProperty("姓名*")
private String realName;
@ExcelProperty("邮箱")
private String email;
@ColumnWidth(15)
- @ExcelProperty("手机")
+ @ExcelProperty("联系电话*")
private String phone;
- @ExcelIgnore
- @ExcelProperty("角色ID")
- private String roleId;
- @ExcelIgnore
- @ExcelProperty("部门ID")
- private String deptId;
+ @ExcelProperty("性别*")
+ private String sex;
- @ExcelIgnore
- @ExcelProperty("岗位ID")
- private String postId;
+// @ExcelProperty("出生日期")
+// private Date birthday;
- @ExcelProperty("角色名称")
- private String roleName;
+ @ExcelProperty("身份证号*")
+ private String cardid;
- @ExcelProperty("部门名称")
- private String deptName;
+ @ExcelProperty("籍贯")
+ private String nativeplace;
- @ExcelProperty("岗位名称")
- private String postName;
+ @ExcelProperty("民族")
+ private String nation;
- @ColumnWidth(20)
- @ExcelProperty("生日")
- private Date birthday;
+ @ExcelProperty("政治面貌")
+ private String politicaloutlook;
+
+
+ @ExcelProperty("身高")
+ private Integer height;
+
+
+ @ExcelProperty("联系地址")
+ private String address;
+
+ @ExcelProperty("户口所在地")
+ private String registered;
+
+ @ExcelProperty("入职时间")
+ private String rtime;
+
+ @ExcelProperty("是否持证*")
+ private String hold;
+
+ @ExcelProperty("保安员证编码")
+ private String securitynumber;
+
+// @ExcelProperty("人员状态")
+// private String status;
+
}
--
Gitblit v1.9.3