Merge remote-tracking branch 'gitee/master'

maku-boot-module/maku-module-generator/src/main/resources/template/java/Query.java.ftl

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import ${package}.framework.common.query.Query;
+import org.springframework.format.annotation.DateTimeFormat;
 
 <#list importList as i>
 import ${i!};
@@ -23,6 +24,9 @@ public class ${ClassName}Query extends Query {
     <#if field.fieldComment!?length gt 0>
     @Schema(description = "${field.fieldComment}")
     </#if>
+    <#if field.attrType == 'Date'>
+    @DateTimeFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    </#if>
     private ${field.attrType} ${field.attrName};
 
 </#list>