From 65dd37fa28891be5aeb60535e3f09639abbaea79 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 15 三月 2021 12:17:18 +0800
Subject: [PATCH] fix(bug修复): 员工附属信息级联删除
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index c0ceb85..d6c6f8d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -43,14 +43,14 @@
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -63,18 +63,18 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
+ @ExcelField(value = "部门(护卫点)")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -160,4 +160,8 @@
@TableField(exist = false)
private String applayDateStr;
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
}
--
Gitblit v1.8.0