From ce5f8a87bb5d411bae67c39b269d879677bb98da Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 19:29:25 +0800
Subject: [PATCH] feat(hrm): 请假导入、加班代申请、批量排班与考勤应出勤重算
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
index 6a10e56..2dff29f 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
@@ -12,7 +12,7 @@
/**
* 钖叕鏍哥畻璁板綍 DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName("hrm_salary_calculation")
@KeySequence("hrm_salary_calculation_seq")
@@ -83,6 +83,13 @@
private BigDecimal otherAllowance;
/**
+ * 鎶ュ伐宸ヨ祫
+ *
+ * 姹囨�昏鍛樺伐鍦ㄦ牳绠楀懆鏈熷唴宸插鎵归�氳繃鐨勭敓浜ф姤宸ュ伐璧勶紝鏍哥畻鏃跺彲鎸変汉璋冩暣
+ */
+ private BigDecimal workWage;
+
+ /**
* 绀句繚鎵ｉ櫎
*/
private BigDecimal socialSecurityDeduction;
@@ -123,6 +130,11 @@
private BigDecimal overtimeHours;
/**
+ * 鎺掔彮鎬诲伐鏃讹紙灏忔椂锛�
+ */
+ private BigDecimal totalWorkHours;
+
+ /**
* 鐘舵�侊細0-寰呯‘璁わ紝10-宸茬‘璁わ紝20-宸插彂鏀�
*/
private Integer status;
--
Gitblit v1.9.3