From 7fdf35a2364c8482c5056a1c932e1501518f943b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 18:17:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 c7bc2ed..792ddfb 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
@@ -18,21 +18,22 @@
@Data
@ApiModel("宸ヨ祫鎶ヨ〃缁熻鍒嗛〉鏁版嵁")
public class SalaryStatisticsListVO implements Serializable{
-
@ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
@ExcelColumn(name="鐢熶骇浜哄憳缂栫爜")
private Integer userId;
- @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕")
+ @ApiModelProperty(value = "鐢熸垚浜哄憳淇℃伅")
+ private UserBaseInfoVO userInfo;
+
+ @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕",hidden = true)
@ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
private String userName;
- @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1")
+ @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1",hidden = true)
@ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
private Integer departId;
- @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�")
+ @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�",hidden = true)
@ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�")
private String departName;
-
@ApiModelProperty(value = "璁′欢宸ヨ祫锛堝垎锛�", example = "1")
@ExcelColumn(name="璁′欢宸ヨ祫锛堝垎锛�")
private BigDecimal jijianSalary;
--
Gitblit v1.9.3