From 40609a1bd11ce79445562ac23f16af23a48c3933 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 18 八月 2023 14:34:28 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes --- server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 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 7d9ba3e..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 姹熻箘韫� @@ -21,4 +24,10 @@ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂") private Integer type; + @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�") + private Integer rootDepartId; + + @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級") + private Integer departId; + } -- Gitblit v1.9.3