From 2837bdd57f72e386bbf9a725e7b3a13e5eb9e930 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 21 八月 2023 09:19:57 +0800 Subject: [PATCH] 修复bug --- server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java index bfe6fa0..2c28097 100644 --- a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java +++ b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java @@ -1,8 +1,11 @@ package doumeemes.dao.ext.dto; +import doumeemes.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import javax.validation.constraints.NotEmpty; /** * @author 姹熻箘韫� @@ -18,7 +21,13 @@ @ApiModelProperty(value = "宸ュ簭鍚嶇О") private String procedureName; - @ApiModelProperty(value = "璁′环鏂瑰紡") - private String type; + @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂") + private Integer type; + + @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�") + private Integer rootDepartId; + + @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級") + private Integer departId; } -- Gitblit v1.9.3