From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 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 4ee26a7..4b4e22d 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -10,6 +10,7 @@
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@@ -71,11 +72,14 @@
* 閮ㄩ棬宀椾綅id
*/
// @Excel(name = "宀椾綅")
- private Integer deptPositionId;
+ private Long deptPositionId;
- @TableField(exist = false)
+// @TableField(exist = false)
+// @Excel(name = "宀椾綅")
+// private String deptPositionName;
+
@Excel(name = "宀椾綅")
- private String deptPositionName;
+ private String postJob;
/**
* 瀹跺涵浣忓潃
@@ -145,6 +149,53 @@
@Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date contractEndTime;
+
+ /**
+ * 寮�濮嬭瘯鐢ㄦ棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date trialStartDate;
+
+ /**
+ * 璇曠敤缁撴潫鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璇曠敤缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date trialEndDate;
+
+ /**
+ * 绛捐鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date signDate;
+
+ /**
+ * 宸ヨ祫鎶ラ叕閫夋嫨鏉℃
+ */
+// @Excel(name = "宸ヨ祫鎶ラ叕閫夋嫨鏉℃")
+ private String salarySelect;
+
+ /**
+ * 璇曠敤鏈熷伐璧�
+ */
+ @Excel(name = "璇曠敤鏈熷伐璧�")
+ private BigDecimal proSalary;
+
+ /**
+ * 鍔冲姩鍚堝悓鏈熼檺閫夋嫨
+ */
+// @Excel(name = "鍔冲姩鍚堝悓鏈熼檺閫夋嫨")
+ private String dateSelect;
+
+ /**
+ * 澶囨敞锛堢鍒╁緟閬囷級
+ */
+ @Excel(name = "澶囨敞锛堢鍒╁緟閬囷級")
+ private String remark;
+
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
--
Gitblit v1.9.3