From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/record/entity/Record.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index 970f01d..7d24cad 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -148,12 +148,13 @@
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 	private String deptid;
-	private String examinetime;
 	private String representativecell;
 	private String contacts;
 	private String contactscell;
 	private String approve;
+	private String cardid;
 	private String jurisdiction;
+	private String ptype;
 	@ApiModelProperty(value = "提交时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

--
Gitblit v1.9.3