diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java
index 15e7298..d4762a9 100644
--- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java
+++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java
@@ -49,10 +49,12 @@ public class PayDwHoursContrast extends BaseEntity {
     /**
      * 上午开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     /**
      * 上午结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
     /**
      * 时长
diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java
index 8f46232..5bac233 100644
--- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java
+++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java
@@ -62,6 +62,7 @@ public class PayDayWorkHoursBo extends BaseEntity {
     /**
      * 日工日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "日工日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date date;
 
@@ -74,7 +75,7 @@ public class PayDayWorkHoursBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String note;
 
 
diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java
index 7191775..f1799a8 100644
--- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java
+++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java
@@ -58,12 +58,14 @@ public class PayDwHoursContrastBo extends BaseEntity {
      * 上午开始时间
      */
     @NotNull(message = "上午开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**
      * 上午结束时间
      */
     @NotNull(message = "上午结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**
diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java
index 1bebdb2..8d942a6 100644
--- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java
+++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java
@@ -99,7 +99,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
     /**
      * 加工总金额
      */
-    @NotNull(message = "加工总金额不能为空", groups = { AddGroup.class, EditGroup.class })
+  //@NotNull(message = "加工总金额不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal amount;
 
     /**
diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java
index 3ca4224..522a3f7 100644
--- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java
+++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java
@@ -63,6 +63,7 @@ public class PayDayWorkHoursVo {
      * 日工日期
      */
     @ExcelProperty(value = "日工日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
     /**
diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java
index 56d6089..3ac853e 100644
--- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java
+++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java
@@ -58,12 +58,14 @@ public class PayDwHoursContrastVo {
      * 上午开始时间
      */
     @ExcelProperty(value = "上午开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**
      * 上午结束时间
      */
     @ExcelProperty(value = "上午结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**