From 2dfaaa8a923b33fb58b8789925ba5b7b2df21f3a Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 14:34:37 +0800
Subject: [PATCH] fix(hrm): 调岗申请人以员工档案的 user_id 为准(前端可能传员工主键)
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
index 945b210..16836b7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
@@ -97,6 +97,10 @@
@ExcelProperty("鍔犵彮鏃堕暱")
private BigDecimal overtimeHours;
+ @Schema(description = "鎺掔彮鎬诲伐鏃�")
+ @ExcelProperty("鎺掔彮鎬诲伐鏃�")
+ private BigDecimal totalWorkHours;
+
@Schema(description = "鐘舵��")
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@DictFormat("hrm_salary_calculation_status")
--
Gitblit v1.9.3