From eaed2b68c6ae85f5b7c177a595f5b0b60b5fb3be Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 25 十二月 2025 18:01:42 +0800
Subject: [PATCH] yys  增加字段

---
 src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
index bdd8077..db79027 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +19,7 @@
  */
 @TableName(value = "staff_join_leave_record")
 @Data
-public class StaffJoinLeaveRecord implements Serializable {
+public class StaffJoinLeaveRecord extends DateQueryDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -33,6 +34,14 @@
     @NotBlank(message = "鍛樺伐鐘舵�佷笉鑳戒负绌�!!!!!!!!")
     @Excel(name = "鐘舵��",readConverterExp = "0=绂昏亴,1=鍏ヨ亴")
     private Integer staffState;
+
+    /**
+     * 璇曠敤鏈燂紙鏈堬級
+     */
+    @Excel(name = "璇曠敤鏈燂紙鏈堬級")
+    private Integer probationPeriod;
+
+
 
     /**
      * 鍛樺伐缂栧彿
@@ -59,10 +68,14 @@
     private String nativePlace;
 
     /**
-     * 宀椾綅
+     * 閮ㄩ棬宀椾綅id
      */
+//    @Excel(name = "宀椾綅")
+    private Long deptPositionId;
+
+    @TableField(exist = false)
     @Excel(name = "宀椾綅")
-    private String postJob;
+    private String deptPositionName;
 
     /**
      * 瀹跺涵浣忓潃

--
Gitblit v1.9.3