From 7d4f60e89deb83eec95f9cbe84824bcefcac2929 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 七月 2021 18:48:11 +0800
Subject: [PATCH] fix 代码生成 queryType 重复勾选数据库无默认值问题

---
 ruoyi-generator/src/main/resources/vm/java/editBo.java.vm |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
index 3f3d988..6472fce 100644
--- a/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
@@ -2,7 +2,6 @@
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
 import javax.validation.constraints.*;
@@ -24,16 +23,17 @@
 #foreach ($column in $columns)
 #if($column.isEdit || $column.isPk==1)
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
-#if($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#end
+#if($column.isRequired==1)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment涓嶈兘涓虹┖")
 #else
     @NotNull(message = "$column.columnComment涓嶈兘涓虹┖")
 #end
+#end
     private $column.javaType $column.javaField;
 #end
 #end

--
Gitblit v1.9.3