From 0e5b425783f87d734d07e83779988c8d18bb2dc7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Nov 2021 23:19:31 +0800
Subject: [PATCH] 保安员新增,修改接口修改,判断是否为民警,导入接口修改

---
 src/main/java/org/springblade/modules/system/excel/UserExcel.java |   52 +++++++++-------------------------------------------
 1 files changed, 9 insertions(+), 43 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..801365f 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,26 @@
 public class UserExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	@ColumnWidth(15)
-	@ExcelProperty("租户编号")
-	private String tenantId;
-
-	@ExcelIgnore
-	@ExcelProperty("用户平台")
-	private String userType;
-
-	@ColumnWidth(20)
-	@ExcelProperty("用户平台名称")
-	private String userTypeName;
+	@ExcelProperty("单位名称*")
+	private String deptId;
 
 	@ColumnWidth(15)
-	@ExcelProperty("账户")
+	@ExcelProperty("警号*")
 	private String account;
 
 	@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;
+	@ExcelProperty("性别*")
+	private String sex;
 
-	@ExcelIgnore
-	@ExcelProperty("部门ID")
-	private String deptId;
+	@ExcelProperty("身份证号*")
+	private String cardid;
 
-	@ExcelIgnore
-	@ExcelProperty("岗位ID")
-	private String postId;
-
-	@ExcelProperty("角色名称")
-	private String roleName;
-
-	@ExcelProperty("部门名称")
-	private String deptName;
-
-	@ExcelProperty("岗位名称")
-	private String postName;
-
-	@ColumnWidth(20)
-	@ExcelProperty("生日")
-	private Date birthday;
 
 }

--
Gitblit v1.9.3