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/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 b27f233..67d40c0 100644
--- a/src/main/java/org/springblade/modules/information/entity/Information.java
+++ b/src/main/java/org/springblade/modules/information/entity/Information.java
@@ -146,4 +146,8 @@
 	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