From 2103731f104c4b98ef596be50ff1dd972b4f6000 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 10 六月 2021 09:44:56 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev --- ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm index b98b42f..c7be089 100644 --- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm @@ -6,8 +6,6 @@ import lombok.EqualsAndHashCode; import java.util.Date; -import java.util.Map; -import java.util.HashMap; #foreach ($import in $importList) import ${import}; @@ -29,6 +27,7 @@ #elseif($table.tree) #set($Entity="TreeEntity") #end + @Data @EqualsAndHashCode(callSuper = true) @ApiModel("${functionName}鍒嗛〉鏌ヨ瀵硅薄") @@ -51,6 +50,9 @@ #foreach ($column in $columns) #if(!$table.isSuperColumn($column.javaField) && $column.query) /** $column.columnComment */ +#if($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +#end @ApiModelProperty("$column.columnComment") private $column.javaType $column.javaField; #end -- Gitblit v1.9.3