From ae659b7fe99a8862082a4ba4bb24148a2a6727ca Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 08 十月 2026 16:57:40 +0800
Subject: [PATCH] feat(芯导): 仓储物流出库 / 人力资源(离职/在职/合同/薪资) / 环保门禁(门禁+智能巡检) 后端
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index ca54c4c..8cc22a0 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -35,7 +35,7 @@
/**
* 鍛樺伐缂栧彿
*/
- @Excel(name = "鍛樺伐缂栧彿")
+ @Excel(name = "鍛樺伐缂栧彿", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING)
private String staffNo;
/**
@@ -123,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