From aed45580b9960e8eec4666b4643f8bda65573b26 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 18 Jul 2024 07:21:12 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/oms/domain/EmisWaybill.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java
index 0a1c137..64e9037 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java
@@ -52,7 +52,7 @@ public class EmisWaybill extends BaseEntity
     /* 订单类型 0-预报订单 1-正式订单 */
     private String orderType;
     /* 下单时间 - 取客户当地时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date orderDate;
     /* 客户ID */
     private Long userId;
@@ -160,7 +160,7 @@ public class EmisWaybill extends BaseEntity
     @TableField
     private String customsEclaration;
     /* 预计到达时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @TableField
     private Date estimateDate;
     /* 包装类型 */
@@ -173,11 +173,11 @@ public class EmisWaybill extends BaseEntity
     @TableField
     private String pickupMethod;
     /* 预计上门取件开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @TableField
     private Date pickStartDate;
     /* 预计上门取件结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @TableField
     private Date pickFinishDate;
     /* 取货失败原因 */
@@ -307,7 +307,7 @@ public class EmisWaybill extends BaseEntity
     @TableField
     private String transferBillcode;
     /* 转单时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date dispFdDate;
     /* 转单原因 */
     private String dispFdReason;
@@ -320,7 +320,7 @@ public class EmisWaybill extends BaseEntity
     /* 登记站点代码 */
     private String registerSiteCode;
     /* 登记时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date registerDate;
     /* 登记人编号 */
     private String registerManCode;
@@ -331,7 +331,7 @@ public class EmisWaybill extends BaseEntity
     /* 发件财务中心代码 */
     private String sendCenterCode;
     /* 发货时间 - 取本地时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date sendDate;
     /* 派件人代码 */
     private String dispatchManCode;
@@ -340,7 +340,7 @@ public class EmisWaybill extends BaseEntity
     /* 派件网点代码 */
     private String dispatchSiteCode;
     /* 生成账单时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date produceBillDate;
     /* 生成账单站点代码 */
     private String produceBillSiteCode;
@@ -405,7 +405,7 @@ public class EmisWaybill extends BaseEntity
     private String signSiteCode;
     /* sign_date */
     @TableField
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date signDate;
 
     /* 时区偏差 */
@@ -413,7 +413,7 @@ public class EmisWaybill extends BaseEntity
     /* 付款状态 字典:emis_payment_status */
     private String paymentStatus;
     /* 付款时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date paymentDate;
     /* 付款备注 */
     private String paymentRemark;