From a327fb5bece99809958c7921fcab67cdc02fae64 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 22 十月 2026 18:50:41 +0800
Subject: [PATCH] fix(sql): 权限对齐 SQL 改为按 path 定位父菜单（兼容不同环境菜单 id），并注明执行前检查 id 占用
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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..c276c95 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;
/**
@@ -39,17 +40,21 @@
private String roleNames;
@ExcelProperty("鍏ヨ亴鏃ユ湡")
- private LocalDate hireDate;
+ private String hireDate;
@ExcelProperty(value = "鍛樺伐鐘舵��", converter = DictConvert.class)
@DictFormat("hrm_employee_status")
private Integer employeeStatus;
+ @ExcelProperty(value = "鍛樺伐绫诲埆", converter = DictConvert.class)
+ @DictFormat("hrm_employee_category")
+ private Integer employeeCategory;
+
@ExcelProperty("韬唤璇佸彿")
private String idCard;
@ExcelProperty("鍑虹敓鏃ユ湡")
- private LocalDate birthday;
+ private String birthday;
@ExcelProperty("姘戞棌")
private String nation;
@@ -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