From 437fa3adb398545e111c832cdb7d0fafd37bece6 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 30 十月 2026 17:14:25 +0800
Subject: [PATCH] fix(hrm): 撤回误建的审批分类,清理无效请假数据,下线重复菜单
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java
index 7b28a1d..9e1443f 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java
@@ -13,7 +13,7 @@
/**
* 鑰冨嫟鎵撳崱璁板綍 DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
*/
@TableName("hrm_attendance_record")
@KeySequence("hrm_attendance_record_seq")
@@ -79,9 +79,42 @@
private BigDecimal overtimeHours;
/**
+ * 褰撳ぉ鏄惁璇峰亣
+ *
+ * 褰撳ぉ瀛樺湪銆屽鎵归�氳繃銆嶇殑璇峰亣鍗曚笖涓庡伐浣滄椂娈垫湁閲嶅彔鏃朵负 true銆�
+ * 璇峰亣褰撳ぉ浠嶅厑璁告墦鍗★紝浣嗕笉绠楄繜鍒�/鏃╅��锛屼篃涓嶇畻缂哄崱銆�
+ */
+ private Boolean leaveFlag;
+
+ /**
+ * 褰撳ぉ璇峰亣宸ユ椂锛堝皬鏃讹級
+ *
+ * 鎸夎鍋囧崟璧锋鏃堕棿涓庤�冨嫟瑙勫垯宸ヤ綔鏃舵姹備氦闆嗚绠楋紝绮剧‘鍒� 0.01 灏忔椂銆�
+ */
+ private BigDecimal leaveHours;
+
+ /**
+ * 褰撳ぉ璇峰亣绫诲瀷锛岄�楀彿鍒嗛殧
+ *
+ * 瀵瑰簲 HrmLeaveTypeEnum 鐨� type锛屽 "1,2" 琛ㄧず褰撳ぉ鏃㈣浜嗕簨鍋囧張璇蜂簡鐥呭亣銆�
+ */
+ private String leaveTypes;
+
+ /**
* 鎵撳崱鍦扮偣
*/
private String location;
+
+ private BigDecimal clockInLongitude;
+ private BigDecimal clockInLatitude;
+ private BigDecimal clockInAccuracy;
+ private BigDecimal clockInDistance;
+ private String clockInAddress;
+ private BigDecimal clockOutLongitude;
+ private BigDecimal clockOutLatitude;
+ private BigDecimal clockOutAccuracy;
+ private BigDecimal clockOutDistance;
+ private String clockOutAddress;
/**
* 澶囨敞
@@ -93,4 +126,4 @@
*/
private Integer dataSource;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3