From 9e9f0e2d9f6fcce7dcea88b181b3c7e6069e8a1b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:55 +0800
Subject: [PATCH] fix(hrm): 请假跨月按天分摊扣款,加班工资按薪酬结构倍率计算
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
index 3ebebc2..deac5a0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
@@ -14,7 +14,7 @@
/**
* 鑰冨嫟瑙勫垯閰嶇疆 DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
*/
@TableName("hrm_attendance_rule")
@KeySequence("hrm_attendance_rule_seq")
@@ -67,6 +67,15 @@
*/
private BigDecimal overtimeThreshold;
+ /** 鑰冨嫟鍦扮偣涓庡彲鎵撳崱鑼冨洿锛涙棫瑙勫垯榛樿涓嶅惎鐢ㄤ綅缃檺鍒躲�� */
+ private String locationName;
+ private String locationAddress;
+ private BigDecimal longitude;
+ private BigDecimal latitude;
+ private Integer radiusMeters;
+ private Boolean locationRequired;
+ private String coordinateSystem;
+
/**
* 鐘舵�侊細0-鍚敤锛�1-绂佺敤
*/
@@ -77,4 +86,4 @@
*/
private String remark;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3