解决时区问题

jjt-biz/src/main/java/com/jjt/biz/vo/KnittingEmpVO.java

@@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -22,7 +20,9 @@ public class KnittingEmpVO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("日期（yyyy-MM-dd）")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(shape = JsonFormat.Shape.STRING,
+            pattern = "yyyy-MM-dd",
+            timezone = "Asia/Shanghai")
     private Date date;
     @ApiModelProperty("员工号")
     private String id;
@@ -31,10 +31,14 @@ public class KnittingEmpVO {
     @ApiModelProperty("班组(A/B)")
     private String team;
     @ApiModelProperty("上班时间（yyyy-MM-dd HH:mm:ss）")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING,
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "Asia/Shanghai")
     private Date in;
     @ApiModelProperty("下班时间（yyyy-MM-dd HH:mm:ss）")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING,
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "Asia/Shanghai")
     private Date out;
     @ApiModelProperty("机台号")
     private List<String> devices;