From 7341e3967c960efd664814b27deec50dc614bb1c Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 31 Aug 2024 05:36:10 +0800 Subject: [PATCH] md --- .../emis/domain/EmisBaseInvoiceChInfo.java | 2 +- .../erp/emis/domain/EmisCustomerUser.java | 4 ++-- .../erp/emis/domain/EmisElectronicPag.java | 2 +- .../emis/domain/EmisElectronicPagApply.java | 6 ++--- .../emis/domain/EmisElectronicSitePag.java | 2 +- .../erp/emis/domain/EmisExchangeRate.java | 4 ++-- .../erp/emis/domain/EmisMonthpayAccount.java | 10 ++++----- .../erp/emis/domain/EmisMonthpayUseApply.java | 4 ++-- .../com/xdadan/erp/emis/domain/EmisOrder.java | 22 +++++++++---------- .../erp/emis/domain/EmisQuotePrice.java | 4 ++-- .../erp/emis/domain/EmisSettleBill.java | 8 +++---- .../domain/EmisSettleInvoiceChRecord.java | 2 +- .../emis/domain/EmisSettleInvoiceRecord.java | 6 ++--- .../erp/emis/domain/EmisSettlePayRecord.java | 6 ++--- .../erp/emis/domain/EmisSettleSubBill.java | 6 ++--- .../com/xdadan/erp/emis/domain/EmisSite.java | 4 ++-- .../erp/emis/domain/EmisSiteAccount.java | 4 ++-- .../erp/emis/domain/EmisSiteBillControl.java | 2 +- .../emis/domain/EmisSitePrepaidRecharge.java | 4 ++-- .../erp/emis/domain/EmisSiteSettleRecord.java | 12 +++++----- .../erp/emis/domain/EmisSmsSendRecord.java | 4 ++-- .../emis/domain/EmisSpecialCalcWeight.java | 4 ++-- .../xdadan/erp/emis/domain/EmisTmsDriver.java | 6 ++--- .../xdadan/erp/emis/domain/EmisTmsPack.java | 4 ++-- .../erp/emis/domain/EmisTmsPackDtl.java | 2 +- .../erp/emis/domain/EmisTmsSiteBatch.java | 6 ++--- .../erp/emis/domain/EmisTmsSiteBatchDtl.java | 2 +- .../erp/emis/domain/EmisTmsTransferTrace.java | 2 +- .../erp/emis/domain/EmisWarehouseIn.java | 4 ++-- .../erp/emis/domain/EmisWarehouseInBatch.java | 4 ++-- .../emis/domain/EmisWaybillAjustApply.java | 6 ++--- .../emis/domain/EmisWaybillComplaints.java | 2 +- .../emis/domain/EmisWaybillProblemInfo.java | 6 ++--- .../erp/emis/domain/EmisWaybillTransfer.java | 2 +- .../erp/emis/domain/vo/WaybillOrder.java | 16 +++++++------- .../emis/service/openbill/hx/HXOrderInfo.java | 6 ++--- .../xdadan/erp/wms/domain/WmsCustomer.java | 8 +++---- .../com/xdadan/erp/wms/domain/WmsOrder.java | 14 ++++++------ .../erp/wms/domain/WmsReceiptItemDetail.java | 2 +- .../erp/wms/domain/WmsReceiptOrder.java | 2 +- .../xdadan/erp/wms/domain/WmsSupplier.java | 8 +++---- 41 files changed, 112 insertions(+), 112 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceChInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceChInfo.java index 5b8e06bf9..01979e2c8 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceChInfo.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceChInfo.java @@ -54,7 +54,7 @@ public class EmisBaseInvoiceChInfo extends BaseEntity /* token */ private String token; /* token失效时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date tokenExpireTime; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java index d487fdeb3..de78a8790 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java @@ -70,7 +70,7 @@ public class EmisCustomerUser extends BaseEntity /* 最后登录ip */ private String loginIp; /* 最后登录日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date loginDate; /* 称呼 */ private String nickName; @@ -157,7 +157,7 @@ public class EmisCustomerUser extends BaseEntity private String opEmpName; // 最近下单时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date lastOrderTime; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java index eeba508fe..872ab604d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java @@ -52,7 +52,7 @@ public class EmisElectronicPag extends BaseEntity /* 剩余数量 */ private Integer hasBillCount; /* 提供日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date provideDate; /* 发放人 */ private String provideMan; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPagApply.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPagApply.java index 617c66074..fec70e0f3 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPagApply.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPagApply.java @@ -40,7 +40,7 @@ public class EmisElectronicPagApply extends BaseEntity /* 申购序号 */ private String applySeq; /* 申购时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date applyDate; /* 申购类型 1-网点 2-个人 */ private String provideType; @@ -61,7 +61,7 @@ public class EmisElectronicPagApply extends BaseEntity /* 是否已发放 */ private String blSend; /* 发放时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date sendDate; /* 发放人编号 */ private String sendManCode; @@ -76,7 +76,7 @@ public class EmisElectronicPagApply extends BaseEntity /* 取消人代码 */ private String cancelManCode; /* 取消时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date cancelDate; /* 取消站点代码 */ private String cancelSiteCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicSitePag.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicSitePag.java index a3dc9b0a2..3a59800e6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicSitePag.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicSitePag.java @@ -56,7 +56,7 @@ public class EmisElectronicSitePag extends BaseEntity /* 面单费 */ private BigDecimal billFee; /* 发放日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date provideDate; /* 发放人 */ private String provideMan; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisExchangeRate.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisExchangeRate.java index d968b42f4..3f66666ff 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisExchangeRate.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisExchangeRate.java @@ -42,10 +42,10 @@ public class EmisExchangeRate extends BaseEntity /* rate */ private String rate; /* start_date */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date startDate; /* end_date */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date endDate; /* 1-valid */ private String blValid; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java index 14fcd7811..dba69564c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java @@ -92,19 +92,19 @@ public class EmisMonthpayAccount extends BaseEntity /* 改动内容 */ private String contractChangeContent; /* 合同开始日 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date contractStartdate; /* 合同结束日 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date contractEnddate; /* 合同签署日 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date contractSigndate; /* 合同寄出日 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date contractSenddate; /* 合同收到日 (我方收到) */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date contractRecievedate; /* 快递公司 */ private String expressName; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java index b2bb16e8a..f43bfbe36 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java @@ -42,12 +42,12 @@ public class EmisMonthpayUseApply extends BaseEntity /* 申请序号 */ private String applySeq; /* 申请时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date applyDate; /* 物料名称:电子面单 */ private String applyName; /* 审核时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date auditDate; /* 审核状态 0-待审核 1-通过 2-审核拒绝 */ private Integer auditStatus; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisOrder.java index 55858a3c3..0f9737c32 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisOrder.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisOrder.java @@ -50,7 +50,7 @@ public class EmisOrder 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; @@ -131,7 +131,7 @@ public class EmisOrder extends BaseEntity /* 报关方式 */ private String customsEclaration; /* 预计到达时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date estimateDate; /* 包装类型 */ private String packType; @@ -140,10 +140,10 @@ public class EmisOrder extends BaseEntity /* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */ private String pickupMethod; /* 预计上门取件开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date pickStartDate; /* 预计上门取件结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date pickFinishDate; /* 取货失败原因 */ private String pickFailReason; @@ -262,7 +262,7 @@ public class EmisOrder extends BaseEntity /* 转单单号 */ 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; @@ -275,7 +275,7 @@ public class EmisOrder 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; @@ -286,17 +286,17 @@ public class EmisOrder 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; /* 派件时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date dispatchDate; /* 派件网点代码 */ 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; @@ -345,7 +345,7 @@ public class EmisOrder extends BaseEntity /* 签收站点代码 */ private String signSiteCode; /* sign_date */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date signDate; /* 揽收图片备注 */ private String billPicSendRmk; @@ -356,7 +356,7 @@ public class EmisOrder 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; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java index d2e7f0d36..6799694c5 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java @@ -98,10 +98,10 @@ public class EmisQuotePrice extends BaseEntity /* 价格取值 */ private String priceType; /* 开始日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date startDate; /* 结束日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date endDate; /* 优先级 */ private Integer priorityLevel; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java index dca7ba1ee..fe82374c0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java @@ -45,10 +45,10 @@ public class EmisSettleBill extends BaseEntity /* 结算账单类型 1-现金 2-月结 */ private String settleType; /* 结算开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date settleStartDate; /* 结算结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date settleEndDate; /* 账单月份 202402 */ private String billMonth; @@ -113,7 +113,7 @@ public class EmisSettleBill extends BaseEntity /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ private String blConfirmCenter; /* 财务确认日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmCenterDate; /* 财务确认备注 */ private String confirmCenterNote; @@ -124,7 +124,7 @@ public class EmisSettleBill extends BaseEntity /* 站点确认状态 0-待确认 1-已确认 2-驳回 3-账单异常 */ private String blConfirmSite; /* 站点确认日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmSiteDate; /* 站点确认人 */ private String confirmSiteManCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java index 318f4d2ea..712755743 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java @@ -92,7 +92,7 @@ public class EmisSettleInvoiceChRecord extends BaseEntity /* 操作人 */ private String opManCode; /* 操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date opDate; /* 操作站点 */ private String opSiteCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java index 4d4d98aa6..d6575058f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java @@ -40,7 +40,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity /* 申请序号 */ private String applySeqNo; /* 申请时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date applyDate; /* 审核人 */ private String applyManCode; @@ -105,7 +105,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity /* 审核状态 0-未审核 1-已审核 */ private String blAudit; /* 审核日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date auditDate; /* 审核人 */ private String auditManCode; @@ -116,7 +116,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity /* 操作人 */ private String opManCode; /* 操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date opDate; /* 操作站点 */ private String opSiteCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRecord.java index 8b27fe44e..c6687360b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRecord.java @@ -50,7 +50,7 @@ public class EmisSettlePayRecord extends BaseEntity /* 审核状态 0-未审核 1-已审核 */ private String blAudit; /* 审核日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date auditDate; /* 审核人 */ private String auditManCode; @@ -77,7 +77,7 @@ public class EmisSettlePayRecord extends BaseEntity /* 结算类型 1-现金 2-月结 */ private String settleType; /* 退款日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date refundDate; /* 退款人 */ private String refundManCode; @@ -114,7 +114,7 @@ public class EmisSettlePayRecord extends BaseEntity /* other_reason */ private String otherReason; /* 交易时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date tradeDate; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java index 0b40219e5..554e4d55d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java @@ -47,7 +47,7 @@ public class EmisSettleSubBill extends BaseEntity /* 运单号 */ private String billCode; /* 出账时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date billDate; /* 账单费用 */ private BigDecimal billFee; @@ -80,7 +80,7 @@ public class EmisSettleSubBill extends BaseEntity /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ private String blConfirmCenter; /* 财务确认日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmCenterDate; /* 财务确认备注 */ private String confirmCenterNote; @@ -91,7 +91,7 @@ public class EmisSettleSubBill extends BaseEntity /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ private String blConfirmSite; /* 站点确认日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmSiteDate; /* 站点确认人 */ private String confirmSiteManCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java index 0438c8a33..39a909989 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java @@ -216,7 +216,7 @@ public class EmisSite extends BaseEntity /* 是否推送京东 */ private String blPushJd; /* 推送时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date pushDate; /* 原因 */ private String reason; @@ -235,7 +235,7 @@ public class EmisSite extends BaseEntity /* 审核状态 */ private String auditStatus; /* 审核时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date auditDate; /* 审核人代码 */ private String auditManCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java index 5a0ff00de..1d8910d56 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java @@ -56,7 +56,7 @@ public class EmisSiteAccount extends BaseEntity /* 币种 */ private String currency; /* 开户日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date startDate; /* 是否启用 1-启用 0-未启用 */ private String blOpen; @@ -67,7 +67,7 @@ public class EmisSiteAccount extends BaseEntity /* 清理站点代码 */ private String clearSiteCode; /* 清理日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date clearDate; /* 清理人编号 */ private String clearManCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java index 0c4f80ddb..6a6fc7d7c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java @@ -40,7 +40,7 @@ public class EmisSiteBillControl extends BaseEntity /* 目的网点 */ private String destSiteCode; /* 控制时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date controlDate; /* 1-启用 */ private String blOpen; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSitePrepaidRecharge.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSitePrepaidRecharge.java index 483d7aae7..bb3837941 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSitePrepaidRecharge.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSitePrepaidRecharge.java @@ -52,14 +52,14 @@ public class EmisSitePrepaidRecharge extends BaseEntity /* 汇款卡号 */ private String remittanceCardNo; /* 汇款日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date remittanceDate; /* 审核网点 */ private String auditSiteCode; /* 审核人 */ private String auditManCode; /* 审核时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date auditDate; /* 审核状态 0-待审核 1-审核通过 2-审核拒绝 */ private String auditStatus; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java index 89168afce..e8bb78b98 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java @@ -62,7 +62,7 @@ public class EmisSiteSettleRecord extends BaseEntity /* 操作类型 加,减 */ private String changeType; /* 操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date changeDate; /* 财务中心代码 */ private String centerCode; @@ -81,13 +81,13 @@ public class EmisSiteSettleRecord extends BaseEntity /* 站点人名称 */ private String siteManName; /* 财务操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date financeDate; /* 网点操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date operataDate; /* 中心日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date centerDate; /* 是否确认 */ private String blConfirm; @@ -104,7 +104,7 @@ public class EmisSiteSettleRecord extends BaseEntity /* 是否站点审核 */ private String blSite; /* 站点日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date siteDate; /* 是否改变费用 */ private String blChargeFee; @@ -113,7 +113,7 @@ public class EmisSiteSettleRecord extends BaseEntity /* 结算ebr代码 */ private String settleEbrCode; /* 结算ebr日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date settleEbrDate; /* 客户代码 */ private String customerCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSmsSendRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSmsSendRecord.java index 6b0ff2095..c7d2a115c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSmsSendRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSmsSendRecord.java @@ -56,7 +56,7 @@ public class EmisSmsSendRecord extends BaseEntity /* 发送渠道 */ private String smsChannel; /* 发送时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date sendDate; /* 渠道发送状态 0-未发送 1-已发送 -1 发送错误 */ private String sendStatus; @@ -65,7 +65,7 @@ public class EmisSmsSendRecord extends BaseEntity /* 渠道错误信息 */ private String errMsg; /* 任务处理时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date taskDate; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java index a89de6151..291387d02 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java @@ -51,10 +51,10 @@ public class EmisSpecialCalcWeight extends BaseEntity /* 结束重量 */ private BigDecimal endWeight; /* 起始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date beginDate; /* 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date endDate; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsDriver.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsDriver.java index 9aad09ba3..cf0bf1a00 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsDriver.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsDriver.java @@ -42,7 +42,7 @@ public class EmisTmsDriver extends BaseEntity /* 婚姻状态 */ private String maritalStatus; /* 生日 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date birthDate; /* 健康状态 */ private String healthStatus; @@ -79,10 +79,10 @@ public class EmisTmsDriver extends BaseEntity /* 2档票数 */ private String secondNum; /* 入职日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date entryTime; /* 登记日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date registerDate; /* 显示顺序 */ private Integer orderNum; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java index 1b8806542..61521aaec 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java @@ -40,7 +40,7 @@ public class EmisTmsPack extends BaseEntity /* 合包名称 */ private String packName; /* 合包时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date packDate; /* 目的国家 */ private String destCountry; @@ -69,7 +69,7 @@ public class EmisTmsPack extends BaseEntity /* 打印次数 */ private Integer printCount; /* 打印时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date printDate; /* 扩展数据 */ private String extData; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java index faab33192..09d556930 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java @@ -43,7 +43,7 @@ public class EmisTmsPackDtl extends BaseEntity /* 是否子单 */ private String blSubBill; /* 扫描时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date scanDate; /* 扫描状态 1-已扫描 0-未扫描 */ private String scanStatus; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java index 689cf1e95..298bb65e0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java @@ -40,7 +40,7 @@ public class EmisTmsSiteBatch extends BaseEntity /* 批次名称 */ private String batchName; /* 批次时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date batchDate; /* 所属线路 */ private String transLineType; @@ -58,10 +58,10 @@ public class EmisTmsSiteBatch extends BaseEntity /* 航空单号 */ private String airBilllNo; /* 预计出发时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date etd; /* 预计到达时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date eta; /* 包数 */ private Integer packNum; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java index 60fe76d46..b09bf4a6f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java @@ -40,7 +40,7 @@ public class EmisTmsSiteBatchDtl extends BaseEntity /* 批次代码 */ private String batchNo; /* 扫描时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date scanDate; /* 扫描状态 1-已扫描 0-未扫描 */ private String scanStatus; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java index b52bed1a7..9b3684708 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java @@ -36,7 +36,7 @@ public class EmisTmsTransferTrace extends BaseEntity /* 单号 */ private String billCode; /* 跟进日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date lastTraceDate; /* 50-签收 */ private String lastWaybillStatus; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java index 2e8d4575a..5063bbfb0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java @@ -50,12 +50,12 @@ public class EmisWarehouseIn extends BaseEntity /* 客户名称 */ private String customerName; /* 进仓日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date entryDate; /* 客户确认状态 0-未确认 1-确认 2-部分确认 3-异常反馈 */ private String confirmStatus; /* 确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmDate; /* 占用状态 0-未占用 1-已全部占用 2-不分占用 */ private String usedStatus; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java index 752739f4b..f195c5a55 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java @@ -52,12 +52,12 @@ public class EmisWarehouseInBatch extends BaseEntity /* 运输工具编号 例如车牌号等 */ private String transCarNo; /* 进仓日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date entryDate; /* 客户确认状态 0-未确认 1-确认 2-部分确认3-异常反馈 */ private String confirmStatus; /* 确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmDate; /* 状态 */ private String status; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java index 12639a62c..4cb8a7bc0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java @@ -46,14 +46,14 @@ public class EmisWaybillAjustApply extends BaseEntity /* 申请财务中心编码 */ private String applyFinanceCenterCode; /* 申请时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date applyDate; /* 目的网点是否审核 0-未审核 1-审核通过 2-审核拒绝 */ private String blDestConfirmed; /* 目的站点代码 */ private String destConfirmSiteCode; /* 目的网点确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date destConfirmDate; /* 目的网点审核备注 */ private String destConfirmNote; @@ -78,7 +78,7 @@ public class EmisWaybillAjustApply extends BaseEntity /* 中心确认人 */ private String centerConfirmManCode; /* 中心确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date centerConfirmDate; /* 中心审核备注 */ private String centerConfirmNote; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillComplaints.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillComplaints.java index 3348b2416..a2bdd8434 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillComplaints.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillComplaints.java @@ -54,7 +54,7 @@ public class EmisWaybillComplaints extends BaseEntity /* 回复网点 */ private String reversionSiteCode; /* 回复日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date reversionDate; /* 是否检查 0-否 1-是 */ private String blCheckok; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java index c40335e05..a9d11aaf5 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java @@ -58,10 +58,10 @@ public class EmisWaybillProblemInfo 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; /* 登记保存时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date registerSaveDate; /* 数据来源 pc,app */ private String dataFrom; @@ -80,7 +80,7 @@ public class EmisWaybillProblemInfo extends BaseEntity /* 回复网点 */ private String reversionSiteCode; /* 回复日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date reversionDate; /* 是否检查 0-否 1-是 */ private String blCheckok; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java index 5a571346a..94c4e62c2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java @@ -40,7 +40,7 @@ public class EmisWaybillTransfer extends BaseEntity /* 转件单号 */ private String transferBillCode; /* 转件日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date transferDate; /* 转件公司 */ private String transferExpress; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java index 0375f3188..0586d9d83 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java @@ -54,7 +54,7 @@ public class WaybillOrder implements Serializable { private String billCodeSub; /* 下单时间 - 取客户当地时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date orderDate; /* 客户ID */ @@ -95,7 +95,7 @@ public class WaybillOrder implements Serializable { private String customsEclaration; /* 预计到达时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date estimateDate; /* 包装类型 */ @@ -108,10 +108,10 @@ public class WaybillOrder implements Serializable { private String pickupMethod; /* 预计上门取件开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date pickStartDate; /* 预计上门取件结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date pickFinishDate; /* 入仓代码 */ @@ -184,7 +184,7 @@ public class WaybillOrder implements Serializable { /* 转单单号 */ 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; /* 转单原因 */ @@ -196,7 +196,7 @@ public class WaybillOrder implements Serializable { /* 登记站点代码 */ 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; @@ -212,7 +212,7 @@ public class WaybillOrder implements Serializable { /* 派件时间 */ private Date dispatchDate; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date sendDate; /* 目的地编号 */ @@ -330,7 +330,7 @@ public class WaybillOrder implements Serializable { /* 签收站点代码 */ private String signSiteCode; /* 签收时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date signDate; /* 当前网点编号 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXOrderInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXOrderInfo.java index 2f6b35513..82341c241 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXOrderInfo.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXOrderInfo.java @@ -97,7 +97,7 @@ public class HXOrderInfo implements Serializable { /** * 订单时间（销售日期） */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date orderDate; /** @@ -118,7 +118,7 @@ public class HXOrderInfo implements Serializable { /** * 原蓝票开票时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date oldInvoiceDate; /** @@ -315,7 +315,7 @@ public class HXOrderInfo implements Serializable { /** * 发货时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date deliveryTime; /** diff --git a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsCustomer.java b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsCustomer.java index b61870771..571e257fb 100644 --- a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsCustomer.java +++ b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsCustomer.java @@ -65,13 +65,13 @@ public class WmsCustomer extends BaseEntity /* 合同号 */ private String contractNo; /* 首签日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date firstContractDate; /* 终止合作日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date cooperationEndDate; /* 申请日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date applyDate; /* 客户计重方式 */ private String calcWeightType; @@ -124,7 +124,7 @@ public class WmsCustomer extends BaseEntity /* 批准文号 */ private String approvalNo; /* 注册日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date registrationDate; /* 联系人1 */ private String contact1; diff --git a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsOrder.java b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsOrder.java index 49cd64537..1cce72a7b 100644 --- a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsOrder.java +++ b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsOrder.java @@ -66,14 +66,14 @@ public class WmsOrder extends BaseEntity /* 发货单号 */ private String shipNo; /* 发货时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date shipTime; /* 发货状态 0-待发货 1-已发货 2-终止 */ private Integer shipStatus; /* 订单状态 0-未确认 1-已确认 2-已取消 3-无效 4-退货 */ private Integer orderStatus; /* 下单时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date orderTime; /* 确认状态 0-待确认 1-确认通过 2-确认拒绝 */ private Integer confirmStatus; @@ -82,31 +82,31 @@ public class WmsOrder extends BaseEntity /* 确认信息 */ private String confirmMsg; /* 确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmTime; /* 毛重 kg */ private BigDecimal grossWeight; /* 净重 kg */ private BigDecimal netWeight; /* 称重时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date weightTime; /* 打包状态 0-待打包 1-已打包 */ private Integer packStatus; /* 打包时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date packTime; /* 运输状态 0-待运输 1-已运输 */ private Integer transportStatus; /* 运输开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date transportTime; /* 运输提单号 */ private String transportMainNo; /* 挂单状态 0-无 1-挂单 */ private Integer hangStatus; /* 挂单时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date hangTime; /* 挂单原因 */ private String hangMsg; diff --git a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptItemDetail.java b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptItemDetail.java index a5be9351a..174850bee 100644 --- a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptItemDetail.java +++ b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptItemDetail.java @@ -59,7 +59,7 @@ public class WmsReceiptItemDetail extends BaseEntity /* 确认信息 */ private String confirmMsg; /* 确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmTime; } diff --git a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptOrder.java b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptOrder.java index 91707cfe8..0cd7e2903 100644 --- a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptOrder.java +++ b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptOrder.java @@ -51,7 +51,7 @@ public class WmsReceiptOrder extends BaseEntity /* 确认信息 */ private String confirmMsg; /* 确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmTime; /* 所属仓库 */ private Long warehouseId; diff --git a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsSupplier.java b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsSupplier.java index 296b2139a..ce0f58062 100644 --- a/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsSupplier.java +++ b/emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsSupplier.java @@ -63,13 +63,13 @@ public class WmsSupplier extends BaseEntity /* 合同号 */ private String contractNo; /* 首签日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date firstContractDate; /* 终止合作日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date cooperationEndDate; /* 申请日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date applyDate; /* 计重方式 */ private String calcWeightType; @@ -122,7 +122,7 @@ public class WmsSupplier extends BaseEntity /* 批准文号 */ private String approvalNo; /* 注册日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date registrationDate; /* 联系人1 */ private String contact1;