From a2599e2fffaf6bb1d781325736f06955fa19511b Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 21 十月 2026 15:24:59 +0800
Subject: [PATCH] fix(芯导): 补回各系统丢失的既有文件修改(分支切换导致)

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

diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index dc17ed2..8cc22a0 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -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