From f4151abee349597ed58a405a8a5e48a5d1a1f7a6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 02 六月 2024 19:06:39 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
index 700d01d..4b9689d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
@@ -51,11 +51,11 @@
     @TableField("empId")
     private Long empId = 0L;
 
-    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+    @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
     @TableField("empName")
     private String empName = "";
 
-    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
     @TableField("certificateNumb")
     private String certificateNumb = "";
 
@@ -91,7 +91,16 @@
 
     //@FieldInfo(name = "version", type = "int", explain = "记录版本号,用来进行乐观锁控制")
     @TableField("version")
-    @Version
+    // @Version
     private Integer version = 0;
 
+    @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+    @TableField(exist = false)
+    private String allDeptName = "";
+
+    @TableField(exist = false)
+    private String deptName = "";
+
+    @TableField(exist = false)
+    private String deptId = "";
 }

--
Gitblit v1.8.0