From b36986a85b17c94b65e0fd5f9f5c860780738338 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 13 Aug 2021 20:47:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/recordk/entity/Recordk.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 4641f02..e3b13df 100644
--- a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
+++ b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
@@ -147,5 +147,12 @@
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 	private String deptid;
+	private String ptype;
+
+	@ApiModelProperty(value = "提交时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date permitime;
+	private String reason;
 
 }

--
Gitblit v1.9.3