From 43aab58c9ecb1203770ba382efbdbae299ca87ec Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 15:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 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 67215a6..1e4fb0e 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
@@ -34,6 +34,10 @@
@ExcelProperty("閮ㄩ棬鍚嶇О")
private String deptName;
+ @Schema(description = "鎵嬫満鍙�")
+ @ExcelProperty("鎵嬫満鍙�")
+ private String phone;
+
@Schema(description = "鑰冨嫟鏃ユ湡")
@ExcelProperty("鑰冨嫟鏃ユ湡")
private LocalDate date;
@@ -51,10 +55,16 @@
@DictFormat("hrm_clock_type")
private Integer clockInType;
+ @Schema(description = "涓婄彮鎵撳崱绫诲瀷鍚嶇О", example = "姝ｅ父")
+ private String clockInTypeName;
+
@Schema(description = "涓嬬彮鎵撳崱绫诲瀷")
@ExcelProperty(value = "涓嬬彮鎵撳崱绫诲瀷", converter = DictConvert.class)
@DictFormat("hrm_clock_type")
private Integer clockOutType;
+
+ @Schema(description = "涓嬬彮鎵撳崱绫诲瀷鍚嶇О", example = "鏃╅��")
+ private String clockOutTypeName;
@Schema(description = "宸ヤ綔鏃堕暱锛堝皬鏃讹級")
@ExcelProperty("宸ヤ綔鏃堕暱")
@@ -67,6 +77,27 @@
@Schema(description = "鎵撳崱鍦扮偣")
@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("澶囨敞")
@@ -81,4 +112,4 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3