From 72a372cb26c4ba489efae6b65dbf9fdfea1b5815 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 19 十一月 2025 16:53:11 +0800
Subject: [PATCH] yys 1.劳保台账修改
---
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index fcd7a17..89b1f6a 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -34,10 +34,16 @@
private Integer season;
/**
- * 閮ㄩ棬鍚嶇О
+ * 閮ㄩ棬宀椾綅id
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "閮ㄩ棬鍚嶇О")
+ @ApiModelProperty("閮ㄩ棬宀椾綅id")
+ private Integer deptPositionName;
+
+ /**
+ * 閮ㄩ棬宀椾綅鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬宀椾綅鍚嶇О")
+ @Excel(name = "閮ㄩ棬宀椾綅鍚嶇О")
@TableField(exist = false)
private String deptName;
@@ -45,6 +51,7 @@
* 鍔充繚鍗曞彿
*/
@ApiModelProperty("鍔充繚鍗曞彿")
+ @Excel(name = "鍔充繚鍗曞彿")
private String orderNo;
/**
@@ -105,15 +112,6 @@
private Long num;
/**
- * 棰嗙敤鏃ユ湡
- */
- @ApiModelProperty("棰嗙敤鏃ユ湡")
- @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date adoptedDate;
-
- /**
* 杩涘巶鏃ユ湡
*/
@ApiModelProperty("杩涘巶鏃ユ湡")
@@ -132,6 +130,15 @@
private Date issueDate;
/**
+ * 棰嗙敤鏃ユ湡
+ */
+ @ApiModelProperty("棰嗙敤鏃ユ湡")
+ @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date adoptedDate;
+
+ /**
* 绛惧悕
*/
@Excel(name = "绛惧悕")
--
Gitblit v1.9.3