From 46d9fb995398d114f70fd4d479dd054b956a1e19 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 24 十二月 2025 13:42:47 +0800
Subject: [PATCH] yys 修改配置文件
---
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 3994833..0ddda5b 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -4,6 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.lavorissue.dto.LaborIssueDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,7 @@
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* @author :yys
@@ -34,10 +36,16 @@
private Integer season;
/**
- * 閮ㄩ棬鍚嶇О
+ * 閮ㄩ棬宀椾綅id
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "閮ㄩ棬鍚嶇О")
+ @ApiModelProperty("閮ㄩ棬宀椾綅id")
+ private Integer deptPositionId;
+
+ /**
+ * 閮ㄩ棬宀椾綅鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬宀椾綅鍚嶇О")
+ @Excel(name = "閮ㄩ棬宀椾綅鍚嶇О")
@TableField(exist = false)
private String deptName;
@@ -48,6 +56,10 @@
@Excel(name = "鍔充繚鍗曞彿")
private String orderNo;
+ @TableField(exist = false)
+ @ApiModelProperty("鎵归噺鍙戞斁")
+ private List<LaborIssueDto> laborIssueList;
+
/**
* 鍛樺伐id
*/
--
Gitblit v1.9.3