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/editBo.java.vm | 12 ++++++++++--
1 files changed, 10 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..3533a91 100644
--- a/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+import javax.validation.constraints.*;
#foreach ($import in $importList)
import ${import};
@@ -17,13 +19,19 @@
@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.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