From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改

---
 src/main/java/org/springblade/modules/record/entity/Record.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 49 insertions(+), 3 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 9773d67..df8095c 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -31,7 +31,7 @@
 
 /**
  * 实体类
- *
+ * 备案表
  * @author BladeX
  * @since 2021-07-12
  */
@@ -62,8 +62,7 @@
 	/**
 	 * 成立日期
 	 */
-	@ApiModelProperty(value = "成立日期")
-	@TableField("establishTime")
+	@ApiModelProperty(value = "注册时间")
 	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date establishtime;
@@ -148,5 +147,52 @@
 	@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 approve;
+	private String cardid;
+	private String representativecell;
+	private String contacts;
+	private String contactscell;
+	private String storage;
+	private String jurisdiction;
+	//派出所审批
+	private String papprove;
+	//县审批
+	private String xapprove;
+	//市审批
+	private String sapprove;
+	//派出意见
+	private String popinion;
+	//县意见
+	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",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date ptime;
+
+	@ApiModelProperty(value = "县审批时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date stime;
+
+	@ApiModelProperty(value = "市审批时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date xtime;
+
 
 }

--
Gitblit v1.9.3