From caa81d1f4dbb0f608b7a6848e673eca2c4a69d10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 五月 2021 16:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-generator/src/main/resources/vm/java/editBo.java.vm | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 a0fac48..60b7e34 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,10 @@
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.*;
#foreach ($import in $importList)
import ${import};
@@ -17,13 +20,22 @@
@Data
@ApiModel("${functionName}缂栬緫瀵硅薄")
public class ${ClassName}EditBo {
- private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
-#if($column.isEdit)
+#if($column.isEdit || $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