From 5d5213f18fc845151e9dcbe51f5dac272c93761d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 18 Aug 2021 19:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/recordk/entity/Recordk.java |   13 +++++++++++++
 1 files changed, 13 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..b21991b 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,18 @@
 	@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;
+	private String cardid;
+	private String representativecell;
+	private String contacts;
+	private String contactscell;
+	private String storage;
+
 
 }

--
Gitblit v1.9.3