From 7d304cdc65aa3cdf75276d7a19e1805992b854cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 03 Dec 2021 16:47:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/recordk/entity/Recordk.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
index fc9a55c..833be2d 100644
--- a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
+++ b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
@@ -163,15 +163,15 @@
 	private String xopinion;
 	//市意见
 	private String sopinion;
-
-	@ApiModelProperty(value = "审批时间")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private Date overtime;
-
-	@ApiModelProperty(value = "提交时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date permitime;
+//
+//	@ApiModelProperty(value = "审批时间")
+//	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+//	@DateTimeFormat(pattern = "yyyy-MM-dd")
+//	private Date overtime;
+//
+//	@ApiModelProperty(value = "提交时间")
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+//	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//	private Date permitime;
 
 }

--
Gitblit v1.9.3