From 5c0bc75816a7b5fa348d658897a304f588d9d0ed Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 20 十一月 2025 14:50:47 +0800
Subject: [PATCH] yys 1.劳保修改
---
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 89b1f6a..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
@@ -37,7 +39,7 @@
* 閮ㄩ棬宀椾綅id
*/
@ApiModelProperty("閮ㄩ棬宀椾綅id")
- private Integer deptPositionName;
+ private Integer deptPositionId;
/**
* 閮ㄩ棬宀椾綅鍚嶇О
@@ -54,6 +56,10 @@
@Excel(name = "鍔充繚鍗曞彿")
private String orderNo;
+ @TableField(exist = false)
+ @ApiModelProperty("鎵归噺鍙戞斁")
+ private List<LaborIssueDto> laborIssueList;
+
/**
* 鍛樺伐id
*/
--
Gitblit v1.9.3