From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
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 d062bea..83292f2 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -39,24 +39,11 @@
private static final long serialVersionUID = 1L;
@ColumnWidth(15)
- @ExcelProperty("租户编号")
- private String tenantId;
-
- @ExcelIgnore
- @ExcelProperty("用户平台")
- private String userType;
-
- @ColumnWidth(20)
- @ExcelProperty("用户平台名称")
- private String userTypeName;
-
- @ColumnWidth(15)
- @ExcelProperty("账户")
+ @ExcelProperty("账号")
private String account;
- @ColumnWidth(10)
- @ExcelProperty("昵称")
- private String name;
+ @ExcelProperty("单位名称")
+ private String deptId;
@ColumnWidth(10)
@ExcelProperty("姓名")
@@ -66,32 +53,50 @@
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 String roleName;
-
- @ExcelProperty("部门名称")
- private String deptName;
-
- @ExcelProperty("岗位名称")
- private String postName;
-
- @ColumnWidth(20)
- @ExcelProperty("生日")
+ @ExcelProperty("出生日期")
private Date birthday;
+ @ExcelProperty("身份证号")
+ private String cardid;
+
+ @ExcelProperty("籍贯")
+ private String nativeplace;
+
+ @ExcelProperty("民族")
+ private String nation;
+
+ @ExcelProperty("政治面貌")
+ private String politicaloutlook;
+
+
+ @ExcelProperty("身高")
+ private Float 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