From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/org/springblade/modules/information/entity/Information.java b/src/main/java/org/springblade/modules/information/entity/Information.java
index bdfa49b..c7b1442 100644
--- a/src/main/java/org/springblade/modules/information/entity/Information.java
+++ b/src/main/java/org/springblade/modules/information/entity/Information.java
@@ -66,8 +66,6 @@
 	 */
 	@ApiModelProperty(value = "成立日期")
 	@TableField("establishTime")
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date establishtime;
 	/**
 	 * 注册资本
@@ -136,6 +134,9 @@
 
 	private String stats;
 	private String jurisdiction;
+	private String representativecell;
+	private String contacts;
+	private String contactscell;
 
 
 }

--
Gitblit v1.9.3