From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
index 4232ad5..ccb9da4 100644
--- a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
@@ -1,10 +1,18 @@
 package com.ruoyi.staff.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 @Data
+@ExcelIgnoreUnannotated
 public class PersonalAttendanceRecordsDto extends PersonalAttendanceRecords {
     @Excel(name = "濮撳悕", sort = 3)
     private String staffName;
@@ -16,4 +24,23 @@
     private String deptName;
 
     private Long deptId;
+
+    //鎵撳崱鐨勭粡搴�
+    private Double longitude;
+
+    //鎵撳崱鐨勭含搴�
+    private Double latitude;
+
+    //鏍囧噯涓婄彮鏃堕棿
+    @JsonFormat(pattern = "HH:mm")
+    @DateTimeFormat(pattern = "HH:mm")
+    private LocalTime startAt;
+
+    //鏍囧噯涓嬬彮鏃堕棿
+    @JsonFormat(pattern = "HH:mm")
+    @DateTimeFormat(pattern = "HH:mm")
+    private LocalTime  endAt;
+
+    //鐝
+    private String shift;
 }

--
Gitblit v1.9.3