From 0af331c7df1f4e3365b3cb5abd60eaaa09807513 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 16 Sep 2021 09:01:41 +0800
Subject: [PATCH] 1.社保

---
 src/main/java/org/springblade/modules/record/entity/Record.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 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..20e9d69 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -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,24 @@
 	@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;
+
+	@ApiModelProperty(value = "审批时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date overtime;
+
 
 }

--
Gitblit v1.9.3