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/business/vo/SalaryParamVO.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java index cb4da76..1dd8edb 100644 --- a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java +++ b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java @@ -18,7 +18,7 @@ private Integer id; @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�") - @ExcelColumn(name="鍒涘缓浜虹紪鐮�",index = 11) + @ExcelColumn(name="鍒涘缓浜哄悕绉�",index = 11) private String createUserName; @ApiModelProperty(value = "鍒涘缓鏃堕棿") @@ -51,6 +51,9 @@ @ApiModelProperty(value = "浜у搧鍚嶇О" ) @ExcelColumn(name="鐗╂枡鍚嶇О",index =3) private String materialName; + @ApiModelProperty(value = "宸ュ巶鍚嶇О" ) + @ExcelColumn(name="宸ュ巶鍚嶇О",index =13) + private String departName; @ApiModelProperty(value = "浜у搧缂栫爜" ) @ExcelColumn(name="鐗╂枡缂栫爜",index =4) @@ -71,7 +74,7 @@ @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�",index =8) private String times; - @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�") + @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏�") @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�",index = 9 ,valueMapping = "0=鍚�;1=鏄�") private Integer unqualified; -- Gitblit v1.9.3