From c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 23 六月 2021 09:44:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-generator/src/main/resources/vm/java/addBo.java.vm | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
index 41fa0e9..82d0862 100644
--- a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/addBo.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,16 @@
#foreach ($column in $columns)
#if($column.isInsert && $column.isPk!=1)
+
/** $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