1

# Conflicts:
#	pom.xml

pom.xml

@@ -99,6 +99,7 @@
                 <nacos.password>nacos</nacos.password>
             </properties>
         </profile>
+
         <profile>
             <id>prod</id>
             <properties>

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;
 
 
 }

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;
 
 
 }

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;
 
 
 }