From 17baf33ab0d5aeec752909e5cc2665da4c2c5ccf Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Sat, 9 Aug 2025 14:58:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(generator):=20=E4=B8=BA=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BO 和 VO 类中，为日期类型字段添加 @DateTimeFormat 和 @JsonFormat 注解
- 设置日期格式为 "yyyy-MM-dd HH:mm:ss"
- 设置时区为 GMT+8
- 在 VO 类中，还添加了 @ExcelProperty 注
---
 gear-generator/src/main/resources/vm/java/bo.java.vm | 4 ++++
 gear-generator/src/main/resources/vm/java/vo.java.vm | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/gear-generator/src/main/resources/vm/java/bo.java.vm b/gear-generator/src/main/resources/vm/java/bo.java.vm
index 41f115d..7665229 100644
--- a/gear-generator/src/main/resources/vm/java/bo.java.vm
+++ b/gear-generator/src/main/resources/vm/java/bo.java.vm
@@ -45,6 +45,10 @@ public class ${ClassName}Bo extends ${Entity} {
 #elseif($column.edit)
 #set($Group="EditGroup.class")
 #end
+#if($column.javaType == 'Date')
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+#end
 #if($column.required)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
diff --git a/gear-generator/src/main/resources/vm/java/vo.java.vm b/gear-generator/src/main/resources/vm/java/vo.java.vm
index 36e12d1..5e3cb11 100644
--- a/gear-generator/src/main/resources/vm/java/vo.java.vm
+++ b/gear-generator/src/main/resources/vm/java/vo.java.vm
@@ -43,6 +43,11 @@ public class ${ClassName}Vo {
     @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
 #else
     @ExcelProperty(value = "${comment}")
+#end
+#if($column.javaType == 'Date')
+    @ExcelProperty(format = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 #end
     private $column.javaType $column.javaField;
 

From 31ab7dcf4055e89c758f716af2233c2151a82f24 Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Sat, 9 Aug 2025 14:58:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(gear-generator):=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=20Date=20=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84=20@ExcelProperty=20=E6=A0=BC=E5=BC=8F=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除了 vo.java.vm 模板中 Date 类型字段的 @ExcelProperty(format = "yyyy-MM-dd HH:mm:ss") 注解
-保留了 @DateTimeFormat 和 @JsonFormat 注解，用于日期格式的处理
---
 gear-generator/src/main/resources/vm/java/bo.java.vm | 4 ++++
 gear-generator/src/main/resources/vm/java/vo.java.vm | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/gear-generator/src/main/resources/vm/java/bo.java.vm b/gear-generator/src/main/resources/vm/java/bo.java.vm
index 41f115d..7665229 100644
--- a/gear-generator/src/main/resources/vm/java/bo.java.vm
+++ b/gear-generator/src/main/resources/vm/java/bo.java.vm
@@ -45,6 +45,10 @@ public class ${ClassName}Bo extends ${Entity} {
 #elseif($column.edit)
 #set($Group="EditGroup.class")
 #end
+#if($column.javaType == 'Date')
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+#end
 #if($column.required)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
diff --git a/gear-generator/src/main/resources/vm/java/vo.java.vm b/gear-generator/src/main/resources/vm/java/vo.java.vm
index 36e12d1..9a6a939 100644
--- a/gear-generator/src/main/resources/vm/java/vo.java.vm
+++ b/gear-generator/src/main/resources/vm/java/vo.java.vm
@@ -43,6 +43,10 @@ public class ${ClassName}Vo {
     @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
 #else
     @ExcelProperty(value = "${comment}")
+#end
+#if($column.javaType == 'Date')
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 #end
     private $column.javaType $column.javaField;