From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +0800
Subject: [PATCH] 报名接口修改,考试计算成绩接口修改，对比答案修改为对比所有题目
---
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 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..f5f96ee 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,8 @@
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("账户")
private String account;
-
- @ColumnWidth(10)
- @ExcelProperty("昵称")
- private String name;
@ColumnWidth(10)
@ExcelProperty("姓名")
@@ -69,29 +53,41 @@
@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 cardid;
- @ExcelProperty("角色名称")
- private String roleName;
+ @ExcelProperty("籍贯")
+ private String nativeplace;
- @ExcelProperty("部门名称")
- private String deptName;
+ @ExcelProperty("民族")
+ private String nation;
- @ExcelProperty("岗位名称")
- private String postName;
+ @ExcelProperty("政治面貌")
+ private String politicaloutlook;
- @ColumnWidth(20)
- @ExcelProperty("生日")
- private Date birthday;
+
+ @ExcelProperty("身高")
+ private Float height;
+
+
+ @ExcelProperty("联系地址")
+ private String address;
+
+ @ExcelProperty("户口所在地")
+ private String registered;
+
+ @ExcelProperty("入职时间")
+ private String rtime;
+
+ @ExcelProperty("是否持证")
+ private String hold;
+
+ @ExcelProperty("保安员证编码")
+ private String securitynumber;
+
}
--
Gitblit v1.9.3