From 0eb8b0635a2e50ff1f82bbea890804e73aae59af Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 10:51:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
index f00415d..792ddfb 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
@@ -23,6 +23,17 @@
private Integer userId;
@ApiModelProperty(value = "鐢熸垚浜哄憳淇℃伅")
private UserBaseInfoVO userInfo;
+
+ @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕",hidden = true)
+ @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
+ private String userName;
+ @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1",hidden = true)
+ @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
+ private Integer departId;
+
+ @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�",hidden = true)
+ @ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�")
+ private String departName;
@ApiModelProperty(value = "璁′欢宸ヨ祫锛堝垎锛�", example = "1")
@ExcelColumn(name="璁′欢宸ヨ祫锛堝垎锛�")
private BigDecimal jijianSalary;
--
Gitblit v1.9.3