日期时区问题修改;
This commit is contained in:
+2
-2
@@ -52,7 +52,7 @@ public class InterceptOrderDTO extends BaseVOEntity {
|
||||
private String interceptByName;
|
||||
|
||||
@ApiModelProperty("拦截时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date interceptTime;
|
||||
|
||||
@@ -70,4 +70,4 @@ public class InterceptOrderDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -24,7 +24,7 @@ public class PurchaseOrderAuditDTO extends BaseVOEntity {
|
||||
private Long auditBy;
|
||||
|
||||
@ApiModelProperty("审核时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date auditTime;
|
||||
|
||||
@@ -37,4 +37,4 @@ public class PurchaseOrderAuditDTO extends BaseVOEntity {
|
||||
private String auditResult;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
+5
-5
@@ -41,7 +41,7 @@ public class PurchaseOrderDTO extends BaseVOEntity {
|
||||
private Long auditBy;
|
||||
|
||||
@ApiModelProperty("审核时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date auditTime;
|
||||
|
||||
@@ -86,7 +86,7 @@ public class PurchaseOrderDTO extends BaseVOEntity {
|
||||
private String org;
|
||||
|
||||
@ApiModelProperty("订单时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date orderTime;
|
||||
|
||||
@@ -115,7 +115,7 @@ public class PurchaseOrderDTO extends BaseVOEntity {
|
||||
private String receivingWarehouse;
|
||||
|
||||
@ApiModelProperty("交货日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date deliveryDate;
|
||||
|
||||
@@ -164,7 +164,7 @@ public class PurchaseOrderDTO extends BaseVOEntity {
|
||||
private Integer tacklState;
|
||||
|
||||
@ApiModelProperty("拦截时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date tacklTime;
|
||||
|
||||
@@ -182,4 +182,4 @@ public class PurchaseOrderDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -46,7 +46,7 @@ public class PurchaseOrderExcelDTO extends BaseVOEntity {
|
||||
|
||||
@ExcelProperty(index = 4)
|
||||
@ApiModelProperty("订单日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date orderTime;
|
||||
|
||||
@ExcelProperty(index = 5)
|
||||
@@ -59,7 +59,7 @@ public class PurchaseOrderExcelDTO extends BaseVOEntity {
|
||||
|
||||
@ExcelProperty(index = 7)
|
||||
@ApiModelProperty("交货日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date deliveryDate;
|
||||
|
||||
@ExcelProperty(index = 8)
|
||||
|
||||
@@ -28,7 +28,7 @@ public class SalesOrderAuditDTO extends BaseVOEntity {
|
||||
private Long auditBy;
|
||||
|
||||
@ApiModelProperty("审核时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date auditTime;
|
||||
|
||||
@@ -39,4 +39,4 @@ public class SalesOrderAuditDTO extends BaseVOEntity {
|
||||
@ApiModelProperty("审核结果")
|
||||
@Excel(name = "审核结果")
|
||||
private String auditResult;
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ public class SalesOrderDTO extends BaseVOEntity {
|
||||
private String auditBy;
|
||||
|
||||
@ApiModelProperty("审核时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date auditTime;
|
||||
|
||||
@@ -118,7 +118,7 @@ public class SalesOrderDTO extends BaseVOEntity {
|
||||
private Integer tacklState;
|
||||
|
||||
@ApiModelProperty("拦截时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date tacklTime;
|
||||
|
||||
@@ -135,7 +135,7 @@ public class SalesOrderDTO extends BaseVOEntity {
|
||||
private String org;
|
||||
|
||||
@ApiModelProperty("订单时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date orderTime;
|
||||
|
||||
@@ -148,7 +148,7 @@ public class SalesOrderDTO extends BaseVOEntity {
|
||||
private String deliveryWarehouse;
|
||||
|
||||
@ApiModelProperty("发货日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date deliveryDate;
|
||||
|
||||
@@ -190,4 +190,4 @@ public class SalesOrderDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
}
|
||||
@@ -54,7 +54,7 @@ public class SalesOrderExcelDTO extends BaseVOEntity {
|
||||
|
||||
@ExcelProperty(index = 4)
|
||||
@ApiModelProperty("订单日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date orderTime;
|
||||
|
||||
@ExcelProperty(index = 5)
|
||||
@@ -75,7 +75,7 @@ public class SalesOrderExcelDTO extends BaseVOEntity {
|
||||
|
||||
@ExcelProperty(index = 7)
|
||||
@ApiModelProperty("发货日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date deliveryDate;
|
||||
|
||||
@ExcelProperty(index = 8)
|
||||
|
||||
Reference in New Issue
Block a user