From 3b1bba4cae03694d1364115b9cd539bee066ce7e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 10 Sep 2021 15:50:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/information/entity/Information.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 6262402..b71e9de 100644
--- a/src/main/java/org/springblade/modules/information/entity/Information.java
+++ b/src/main/java/org/springblade/modules/information/entity/Information.java
@@ -139,6 +139,10 @@
 	private String contactscell;
 	private String businessLicense;
 	private String licence;
+	private String fregion;
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date ftime;
 
 
 }

--
Gitblit v1.9.3