From 1284fb157043e488aa1794d8f1b64ebf18aa5147 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..8cc22a0 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;
/**
@@ -122,6 +123,19 @@
@Excel(name = "鍚堝悓鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date contractExpireTime;
+ /**
+ * 鍏ヨ亴鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ヨ亴鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date entryDate;
+
+ /**
+ * 钖祫
+ */
+ @Excel(name = "钖祫")
+ private java.math.BigDecimal salary;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3