From f2343d4e86b4dfe53122a1bd62d7d2f263c3ed3d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 14 八月 2023 15:51:23 +0800 Subject: [PATCH] 新增员工绩效分页查询接口 --- server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java | 14 ++------------ 1 files changed, 2 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..f00415d 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,11 @@ @Data @ApiModel("宸ヨ祫鎶ヨ〃缁熻鍒嗛〉鏁版嵁") public class SalaryStatisticsListVO implements Serializable{ - @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1") @ExcelColumn(name="鐢熶骇浜哄憳缂栫爜") private Integer userId; - @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕") - @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕") - private String userName; - @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1") - @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�") - private Integer departId; - - @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�") - @ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�") - private String departName; - + @ApiModelProperty(value = "鐢熸垚浜哄憳淇℃伅") + private UserBaseInfoVO userInfo; @ApiModelProperty(value = "璁′欢宸ヨ祫锛堝垎锛�", example = "1") @ExcelColumn(name="璁′欢宸ヨ祫锛堝垎锛�") private BigDecimal jijianSalary; -- Gitblit v1.9.3