diff --git a/klp-wms/src/main/java/com/klp/domain/WmsAttendanceShift.java b/klp-wms/src/main/java/com/klp/domain/WmsAttendanceShift.java
index fcfd09ba..ecd2228c 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsAttendanceShift.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsAttendanceShift.java
@@ -6,8 +6,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 班次对象 wms_attendance_shift
@@ -42,19 +43,27 @@ public class WmsAttendanceShift extends BaseEntity {
     /**
      * 上班1
      */
-    private Date startTime;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime startTime;
     /**
      * 下班1
      */
-    private Date endTime;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime endTime;
     /**
      * 上班2
      */
-    private Date startTime2;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime startTime2;
     /**
      * 下班2
      */
-    private Date endTime2;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime endTime2;
     /**
      * 是否跨天
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceShiftBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceShiftBo.java
index 3858cf19..0b322918 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceShiftBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceShiftBo.java
@@ -6,8 +6,9 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 班次业务对象 wms_attendance_shift
@@ -43,22 +44,30 @@ public class WmsAttendanceShiftBo extends BaseEntity {
     /**
      * 上班1
      */
-    private Date startTime;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime startTime;
 
     /**
      * 下班1
      */
-    private Date endTime;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime endTime;
 
     /**
      * 上班2
      */
-    private Date startTime2;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime startTime2;
 
     /**
      * 下班2
      */
-    private Date endTime2;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime endTime2;
 
     /**
      * 是否跨天
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceShiftVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceShiftVo.java
index 6d28fc91..d9b12e27 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceShiftVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceShiftVo.java
@@ -1,13 +1,14 @@
 package com.klp.domain.vo;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 /**
@@ -53,25 +54,33 @@ public class WmsAttendanceShiftVo {
      * 上班1
      */
     @ExcelProperty(value = "上班1")
-    private Date startTime;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime startTime;
 
     /**
      * 下班1
      */
     @ExcelProperty(value = "下班1")
-    private Date endTime;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime endTime;
 
     /**
      * 上班2
      */
     @ExcelProperty(value = "上班2")
-    private Date startTime2;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime startTime2;
 
     /**
      * 下班2
      */
     @ExcelProperty(value = "下班2")
-    private Date endTime2;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private LocalTime endTime2;
 
     /**
      * 是否跨天