Merge branch 'master' of https://gitee.com/hdka/FURNITURE-OA

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 })

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;