From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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..79f4038 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
@@ -18,29 +18,30 @@
@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")
- @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
+ @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="璁′欢宸ヨ祫锛堝垎锛�")
+ @ApiModelProperty(value = "璁′欢宸ヨ祫锛堝厓锛�", example = "1")
+ @ExcelColumn(name="璁′欢宸ヨ祫锛堝厓锛�")
private BigDecimal jijianSalary;
- @ApiModelProperty(value = "璁℃椂宸ヨ祫锛堝垎锛�", example = "1")
- @ExcelColumn(name="璁℃椂宸ヨ祫锛堝垎锛�")
+ @ApiModelProperty(value = "璁℃椂宸ヨ祫锛堝厓锛�", example = "1")
+ @ExcelColumn(name="璁℃椂宸ヨ祫锛堝厓锛�")
private BigDecimal jishiSalary;
- @ApiModelProperty(value = "灏忚宸ヨ祫锛堝垎锛�", example = "1")
- @ExcelColumn(name="灏忚宸ヨ祫锛堝垎锛�")
+ @ApiModelProperty(value = "灏忚宸ヨ祫锛堝厓锛�", example = "1")
+ @ExcelColumn(name="灏忚宸ヨ祫锛堝厓锛�")
private BigDecimal totalSalary;
@ApiModelProperty(value = "鎶ュ伐鎬诲崟鏁�,涓嶅寘鍚伐璧勪负0鐨�", example = "1")
@ExcelColumn(name="鎶ュ伐鎬诲崟鏁�")
--
Gitblit v1.9.3