From 34d7b406455fe7cef90177790af079309631a06f Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Mon, 21 Jul 2025 10:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 22 ++++++++++---------
.../property/domain/AttendanceShift.java | 8 +++----
.../property/domain/bo/AttendanceShiftBo.java | 8 +++----
.../property/domain/vo/AttendanceShiftVo.java | 8 +++----
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index f2ed45b..456be63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,8 @@
dev
192.168.24.101:8848
192.168.24.101:4560
+
+
DEFAULT_GROUP
DEFAULT_GROUP
nacos
@@ -367,17 +369,17 @@
${mapstruct-plus.version}
-
- com.hik
- examples
- ${hik-sdk.version}
-
+
+
+
+
+
-
- com.hik
- jna
- ${hik-sdk.version}
-
+
+
+
+
+
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java
index d71f694..459ae57 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java
@@ -41,12 +41,12 @@ public class AttendanceShift extends TenantEntity {
/**
* 考勤开始时间
*/
- private DateTime startTime;
+ private LocalTime startTime;
/**
* 考勤结束时间
*/
- private DateTime endTime;
+ private LocalTime endTime;
/**
* 状态（0：off，1：on）
@@ -61,12 +61,12 @@ public class AttendanceShift extends TenantEntity {
/**
* 休息开始时间
*/
- private DateTime restStartTime;
+ private LocalTime restStartTime;
/**
* 休息结束时间
*/
- private DateTime restEndTime;
+ private LocalTime restEndTime;
}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java
index cded8be..cf4f513 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java
@@ -42,13 +42,13 @@ public class AttendanceShiftBo extends BaseEntity {
* 考勤开始时间
*/
@DateTimeFormat(pattern = "HH:mm:ss")
- private DateTime startTime;
+ private LocalTime startTime;
/**
* 考勤结束时间
*/
@DateTimeFormat(pattern = "HH:mm:ss")
- private DateTime endTime;
+ private LocalTime endTime;
/**
* 状态（0：off，1：on）
@@ -64,13 +64,13 @@ public class AttendanceShiftBo extends BaseEntity {
* 休息开始时间
*/
@DateTimeFormat(pattern = "HH:mm:ss")
- private DateTime restStartTime;
+ private LocalTime restStartTime;
/**
* 休息结束时间
*/
@DateTimeFormat(pattern = "HH:mm:ss")
- private DateTime restEndTime;
+ private LocalTime restEndTime;
}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java
index ac256f9..6bf0f59 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java
@@ -49,13 +49,13 @@ public class AttendanceShiftVo implements Serializable {
* 考勤开始时间
*/
@ExcelProperty(value = "考勤开始时间")
- private DateTime startTime;
+ private LocalTime startTime;
/**
* 考勤结束时间
*/
@ExcelProperty(value = "考勤结束时间")
- private DateTime endTime;
+ private LocalTime endTime;
/**
* 状态（0：off，1：on）
@@ -75,13 +75,13 @@ public class AttendanceShiftVo implements Serializable {
* 休息开始时间
*/
@ExcelProperty(value = "休息开始时间")
- private DateTime restStartTime;
+ private LocalTime restStartTime;
/**
* 休息结束时间
*/
@ExcelProperty(value = "休息结束时间")
- private DateTime restEndTime;
+ private LocalTime restEndTime;
}