From 91b92422716cb4c5d0433f77fd2d6d45a69639c4 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 15 八月 2023 18:35:17 +0800
Subject: [PATCH] # 工资表配置表 联调修改
---
server/src/main/java/doumeemes/dao/ext/dto/SalaryParamImportDTO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamImportDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamImportDTO.java
index 59044f2..851d29e 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamImportDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamImportDTO.java
@@ -1,6 +1,7 @@
package doumeemes.dao.ext.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -12,6 +13,7 @@
*/
@Data
@ApiModel("缁╂晥宸ヨ祫閰嶇疆瀵煎叆")
+@ExcelTarget("SalaryParamImportDTO")
public class SalaryParamImportDTO {
@Excel(name="璁′环鏂瑰紡",orderNum ="1")
@@ -20,10 +22,10 @@
@Excel(name="宸ュ巶鍚嶇О",orderNum ="2")
private String departName;
- @Excel(name="浜у搧鍚嶇О",orderNum ="3")
+ @Excel(name="鐗╂枡鍚嶇О",orderNum ="3")
private String materialName;
- @Excel(name="浜у搧缂栫爜",orderNum ="4")
+ @Excel(name="鐗╂枡缂栫爜",orderNum ="4")
private String materialCode;
@Excel(name="宸ュ簭鍚嶇О",orderNum ="5")
@@ -33,7 +35,7 @@
private BigDecimal salary;
@Excel(name="鏍囧噯浜у嚭",orderNum ="7")
- private Integer NUM;
+ private String num;
@Excel(name="鏍囧噯宸ユ椂",orderNum ="8")
private String timesName;
--
Gitblit v1.9.3