From ef3cbc1c6882786e8218b08be3e52ea44587f03b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 09:45:42 +0800
Subject: [PATCH] feat(hrm): 请假批量导入、加班代申请人、批量排班与节假日区间联动
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
index b784f3d..26849d0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
@@ -160,6 +160,33 @@
private BigDecimal baseSalary;
/**
+ * 鏍囧噯宸ヨ祫
+ *
+ * 鐢ㄤ簬宸ヨ祫琛細鏍囧噯鍑哄嫟宸ヨ祫 = 鏍囧噯宸ヨ祫 梅 鏍囧噯鍑哄嫟澶╂暟 脳 璁¤柂鍑哄嫟
+ */
+ private BigDecimal standardSalary;
+
+ /**
+ * 宀椾綅宸ヨ祫
+ */
+ private BigDecimal postSalary;
+
+ /**
+ * 鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�
+ */
+ private BigDecimal overtimeHourlyRate;
+
+ /**
+ * 瀹夊叏鐜繚濂栨爣鍑�
+ */
+ private BigDecimal safetyAwardStandard;
+
+ /**
+ * 缁╂晥鏍囧噯
+ */
+ private BigDecimal performanceStandard;
+
+ /**
* 瑙掕壊ID鍒楄〃
*
* 鐢ㄤ簬鍒嗛厤绯荤粺鐢ㄦ埛瑙掕壊锛孞SON 鏍煎紡瀛樺偍
--
Gitblit v1.9.3