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/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
index aa44d1e..ba38232 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
@@ -78,6 +78,27 @@
@ExcelProperty("鎵撳崱鍦扮偣")
private String location;
+ @Schema(description = "涓婄彮鎵撳崱缁忓害锛圵GS84锛�")
+ private BigDecimal clockInLongitude;
+ @Schema(description = "涓婄彮鎵撳崱绾害锛圵GS84锛�")
+ private BigDecimal clockInLatitude;
+ @Schema(description = "涓婄彮瀹氫綅绮惧害锛岀背")
+ private BigDecimal clockInAccuracy;
+ @Schema(description = "涓婄彮璺濊鍒欏湴鐐硅窛绂伙紝绫�")
+ private BigDecimal clockInDistance;
+ @Schema(description = "涓婄彮瑙勫垯鍦扮偣鍦板潃蹇収")
+ private String clockInAddress;
+ @Schema(description = "涓嬬彮鎵撳崱缁忓害锛圵GS84锛�")
+ private BigDecimal clockOutLongitude;
+ @Schema(description = "涓嬬彮鎵撳崱绾害锛圵GS84锛�")
+ private BigDecimal clockOutLatitude;
+ @Schema(description = "涓嬬彮瀹氫綅绮惧害锛岀背")
+ private BigDecimal clockOutAccuracy;
+ @Schema(description = "涓嬬彮璺濊鍒欏湴鐐硅窛绂伙紝绫�")
+ private BigDecimal clockOutDistance;
+ @Schema(description = "涓嬬彮瑙勫垯鍦扮偣鍦板潃蹇収")
+ private String clockOutAddress;
+
@Schema(description = "澶囨敞")
@ExcelProperty("澶囨敞")
private String remark;
@@ -87,8 +108,19 @@
@DictFormat("hrm_data_source")
private Integer dataSource;
+ @Schema(description = "褰撳ぉ鏄惁璇峰亣", example = "false")
+ @ExcelProperty("鏄惁璇峰亣")
+ private Boolean leaveFlag;
+
+ @Schema(description = "褰撳ぉ璇峰亣宸ユ椂锛堝皬鏃讹級", example = "3.5")
+ @ExcelProperty("璇峰亣宸ユ椂")
+ private BigDecimal leaveHours;
+
+ @Schema(description = "褰撳ぉ璇峰亣绫诲瀷锛岄�楀彿鍒嗛殧", example = "1,2")
+ private String leaveTypes;
+
@Schema(description = "鍒涘缓鏃堕棿")
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3