From 89071e0c09188d75c3d537f82204ae19713ac7fe Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 12 十月 2026 10:09:33 +0800
Subject: [PATCH] feat(hrm): 合同生成与模板下载、员工转正、导入导出字段对齐
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
index 977f0c1..20f930f 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
@@ -8,6 +8,7 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
import java.time.LocalDate;
/**
@@ -45,6 +46,10 @@
@DictFormat("hrm_employee_status")
private Integer employeeStatus;
+ @ExcelProperty(value = "鍛樺伐绫诲埆", converter = DictConvert.class)
+ @DictFormat("hrm_employee_category")
+ private Integer employeeCategory;
+
@ExcelProperty("韬唤璇佸彿")
private String idCard;
@@ -72,4 +77,16 @@
@ExcelProperty("澶囨敞")
private String remark;
+ @ExcelProperty("鍩烘湰宸ヨ祫")
+ private BigDecimal baseSalary;
+
+ @ExcelProperty("寮�鎴烽摱琛�")
+ private String bankName;
+
+ @ExcelProperty("閾惰璐﹀彿")
+ private String bankAccount;
+
+ @ExcelProperty("灞呬綇鍦板潃")
+ private String address;
+
}
--
Gitblit v1.9.3