From fa4a310bb94f41bdc7af068bd380fdfeafb881c7 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 26 十月 2026 14:14:20 +0800
Subject: [PATCH] feat(hrm): 薪酬核算新增「岗位工资」「工龄工资」
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
index 383b2b5..8518054 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
@@ -46,7 +46,7 @@
@Schema(description = "鎬у埆")
@ExcelProperty(value = "鎬у埆", converter = DictConvert.class)
- @DictFormat("system_user_sex")
+ @DictFormat("hrm_gender")
private Integer gender;
@Schema(description = "鍑虹敓鏃ユ湡")
@@ -54,7 +54,7 @@
private LocalDate birthday;
@Schema(description = "鎵嬫満鍙风爜")
- @ExcelProperty("鎵嬫満鍙风爜")
+ @ExcelProperty("鎵嬫満鍙�")
private String phone;
@Schema(description = "閭")
@@ -122,11 +122,21 @@
@ExcelProperty("鍩烘湰宸ヨ祫")
private BigDecimal baseSalary;
+ /**
+ * 宀椾綅宸ヨ祫
+ */
+ private BigDecimal postSalary;
+
+ /**
+ * 宸ラ緞宸ヨ祫
+ */
+ private BigDecimal senioritySalary;
+
@Schema(description = "瑙掕壊ID鍒楄〃")
private List<Long> roleIds;
@Schema(description = "瑙掕壊鍚嶇О鍒楄〃")
- @ExcelProperty("瑙掕壊")
+ @ExcelProperty("鐢ㄦ埛瑙掕壊")
private String roleNames;
@Schema(description = "寮�鎴烽摱琛�")
--
Gitblit v1.9.3