diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 3b339c526..6b4e66cf0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -343,6 +343,7 @@ public class EmisWaybill extends BaseEntity /* 签收站点代码 */ private String signSiteCode; /* 签收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date signDate; /* 揽收图片备注 */ private String billPicSendRmk; 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 12dd98890..c2e5abc9d 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 @@ -310,7 +310,8 @@ public class WaybillOrder implements Serializable { /* 签收站点代码 */ private String signSiteCode; /* 签收时间 */ - private String signDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date signDate;