From f9ff113e9d2e9a3e643b185f08652004e5e43d94 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Dec 2021 16:19:37 +0800
Subject: [PATCH] 保安员统计导出,业务情况统计导出修改

---
 src/main/java/org/springblade/modules/permit/entity/Permit.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/permit/entity/Permit.java b/src/main/java/org/springblade/modules/permit/entity/Permit.java
index 9fe56e8..978ffc4 100644
--- a/src/main/java/org/springblade/modules/permit/entity/Permit.java
+++ b/src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -64,12 +64,12 @@
 	 */
 	@ApiModelProperty(value = "成立日期")
 	@TableField("establishTime")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date establishtime;
 
 	@ApiModelProperty(value = "提交时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date permitime;
 	/**
@@ -143,4 +143,9 @@
 	private String approve;
 	private String jurisdiction;
 
+	@ApiModelProperty(value = "审批时间")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date overtime;
+
 }

--
Gitblit v1.9.3