From cfa6aa1bba4e4c55a8f88174aa93afab86bb33cd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 13 九月 2023 15:49:24 +0800
Subject: [PATCH] lingyang配置问卷
---
server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 3f79317..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 = "鍒涘缓鏃堕棿")
@@ -26,16 +26,16 @@
private Date createTime;
@ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
- @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
+// @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
private Integer rootDepartId;
@ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
- @ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
+// @ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
@NotEmpty(message = "宸ュ巶缂栫爜涓嶈兘涓虹┖")
private Integer departId;
@ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+// @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
@NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
private Integer procedureId;
@@ -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