From b3024fd012fc39bc0cbe52a5775748df428fe5ee Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 09:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
index 2a1db68..2028f71 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
@@ -48,12 +48,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -68,7 +68,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -77,7 +77,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -296,6 +295,7 @@
private String settleStatusName = "";
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
--
Gitblit v1.8.0