From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
index 5ca376d..a497d59 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
@@ -26,7 +26,7 @@
@ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
private String userName;
@ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1",hidden = true)
- @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
+// @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
private Integer departId;
@ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�",hidden = true)
@@ -39,7 +39,7 @@
@ExcelColumn(name="鐗╂枡鍚嶇О")
private String materialName;
@ApiModelProperty(value = "鐗╂枡涓婚敭", example = "1")
- @ExcelColumn(name="鐗╂枡涓婚敭")
+// @ExcelColumn(name="鐗╂枡涓婚敭")
private Integer materialId;
@ApiModelProperty(value = "宸ュ崟缂栫爜", example = "1")
@ExcelColumn(name="宸ュ崟缂栫爜")
@@ -66,7 +66,7 @@
@ExcelColumn(name="涓嶈壇鍝佹暟")
private BigDecimal unQualifiedNum;
@ApiModelProperty(value = "鍚堟牸鐜囷紙%锛�")
- @ExcelColumn(name="鍚堟牸鐜�(%)")
+ @ExcelColumn(name="鍚堟牸鐜�(%)" ,suffix="%")
private BigDecimal rate;
}
--
Gitblit v1.9.3