From 3ce3752ad8bfb82568ccebc800f6470476b214cc Mon Sep 17 00:00:00 2001
From: Parker <meet.parker@foxmail.com>
Date: Thu, 28 Jan 2021 21:53:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=20=E7=94=9F=E6=88=90=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8BBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/tpl/backend/model/TemplateModel.html   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/model/TemplateModel.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/model/TemplateModel.html
index ede5bfb..b991515 100644
--- a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/model/TemplateModel.html
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/model/TemplateModel.html
@@ -70,12 +70,12 @@ public class #(data.model.tableName)Model extends ApiWrapper {
     #end
     #end
     ### 日期处理
-    #if(column.javaType == "Date" && column.showType == "3")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    #else if(column.javaType == "Date" && column.showType == "4")
+    #if(column.javaType == "Date" && column.showType == "4")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    #else
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     #end
     private #(column.javaType) #(column.fieldName);