From 5e55cbc7cf95b0f892ae4066a7699a5f76a0f2f3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 23 十二月 2025 18:25:31 +0800
Subject: [PATCH] 修改字段,接口

---
 src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 19fb2bf..2a88378 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.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;
@@ -16,7 +17,7 @@
  */
 @TableName(value = "staff_on_job")
 @Data
-public class StaffOnJob implements Serializable {
+public class StaffOnJob extends DateQueryDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -34,7 +35,7 @@
     /**
      * 鍛樺伐缂栧彿
      */
-    @Excel(name = "鍛樺伐缂栧彿")
+    @Excel(name = "鍛樺伐缂栧彿", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING)
     private String staffNo;
 
     /**
@@ -56,10 +57,14 @@
     private String nativePlace;
 
     /**
-     * 宀椾綅
+     * 閮ㄩ棬宀椾綅id
      */
+//    @Excel(name = "宀椾綅")
+    private Integer deptPositionId;
+
+    @TableField(exist = false)
     @Excel(name = "宀椾綅")
-    private String postJob;
+    private String deptPositionName;
 
     /**
      * 瀹跺涵浣忓潃

--
Gitblit v1.9.3