From b51035f9b991bb08f8afd6fa60e04e548da9a74e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 八月 2023 17:57:29 +0800
Subject: [PATCH] 新增员工绩效\工资报表导出接口
---
server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
index 93e9397..049cf7d 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
@@ -1,6 +1,7 @@
package doumeemes.dao.ext.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,11 +22,13 @@
private Integer procedureId;
@ApiModelProperty(value = "鐗╂枡缂栫爜", example = "1")
private Integer materialId;
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О鎴栫墿鏂檆ode缂栫爜" )
+ private String materialName;
@ApiModelProperty(value = "鏍圭粍缁囩紪鐮�", example = "1",hidden = true)
private Integer rootDepartId;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date stateDate;
+ private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
--
Gitblit v1.9.3