Merge remote-tracking branch 'origin/master'

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PaySubInfoBo.java

@@ -44,6 +44,7 @@ public class PaySubInfoBo extends BaseEntity {
     /**
      * 开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date startTime;
 
@@ -51,6 +52,7 @@ public class PaySubInfoBo extends BaseEntity {
      * 结束时间
      */
     @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date endTime;
 
     /**

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySubInfoVo.java

@@ -44,12 +44,14 @@ public class PaySubInfoVo {
     /**
      * 开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ExcelProperty(value = "开始时间")
     private Date startTime;
 
     /**
      * 结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ExcelProperty(value = "结束时间")
     private Date endTime;