From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/employee/EmployeeInfoModel.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/employee/EmployeeInfoModel.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/employee/EmployeeInfoModel.java
new file mode 100644
index 0000000..16d415c
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/employee/EmployeeInfoModel.java
@@ -0,0 +1,66 @@
+package jnpf.model.employee;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * @author JNPF寮�鍙戝钩鍙扮粍
+ * @version V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙�
+ *
+ */
+@Data
+public class EmployeeInfoModel {
+    @Schema(description ="鍑虹敓骞存湀")
+    private Date birthday;
+    @Schema(description ="鍙傚姞宸ヤ綔")
+    private String attendWorkTime;
+    @Schema(description ="鍒涘缓鏃堕棿")
+    private Date creatorTime;
+    @Schema(description ="鍒涘缓鐢ㄦ埛")
+    private String creatorUserId;
+    @Schema(description ="鍒犻櫎鏍囧織")
+    private String deleteMark;
+    @Schema(description ="鍒犻櫎鏃堕棿")
+    private Date deleteTime;
+    @Schema(description ="鍒犻櫎鐢ㄦ埛")
+    private String deleteUserId;
+    @Schema(description ="閮ㄩ棬")
+    private String departmentName;
+    @Schema(description ="鎻忚堪")
+    private String description;
+    @Schema(description ="鏈�楂樺鍘�")
+    private String education;
+    @Schema(description ="宸ュ彿")
+    private String enCode;
+    @Schema(description ="鏈夋晥鏍囧織")
+    private Integer enabledMark;
+    @Schema(description ="濮撳悕")
+    private String fullName;
+    @Schema(description ="鎬у埆")
+    private String gender;
+    @Schema(description ="姣曚笟闄㈡牎")
+    private String graduationAcademy  ;
+    @Schema(description ="姣曚笟鏃堕棿")
+    private Date graduationTime;
+    @Schema(description ="鑷劧涓婚敭")
+    private String id;
+    @Schema(description ="韬唤璇佸彿")
+    private String idNumber;
+    @Schema(description ="淇敼鏃堕棿")
+    private Date lastModifyTime;
+    @Schema(description ="淇敼鐢ㄦ埛")
+    private String lastModifyUserId;
+    @Schema(description ="鎵�瀛︿笓涓�")
+    private String major;
+    @Schema(description ="宀椾綅")
+    private String positionName;
+    @Schema(description ="鎺掑簭")
+    private String sortCode;
+    @Schema(description ="鑱旂郴鐢佃瘽")
+    private String telephone;
+    @Schema(description ="鐢ㄥ伐鎬ц川")
+    private String workingNature;
+}

--
Gitblit v1.8.0