From f2732b0a8c5bc4e1ddbcafa5eeffd1e6ed2e52b7 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 10 三月 2026 13:19:59 +0800
Subject: [PATCH] yys 优化员工工资计算逻辑
---
src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
index 7da7e54..ccb9da4 100644
--- a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
@@ -9,6 +9,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
+import java.time.LocalTime;
@Data
@ExcelIgnoreUnannotated
@@ -33,10 +34,13 @@
//鏍囧噯涓婄彮鏃堕棿
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
- private LocalDateTime startAt;
+ private LocalTime startAt;
//鏍囧噯涓嬬彮鏃堕棿
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
- private LocalDateTime endAt;
+ private LocalTime endAt;
+
+ //鐝
+ private String shift;
}
--
Gitblit v1.9.3