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 |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 e1727ed..3533a91 100644
--- a/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
@@ -4,6 +4,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
+import javax.validation.constraints.*;
 
 #foreach ($import in $importList)
 import ${import};
@@ -20,10 +21,17 @@
 public class ${ClassName}EditBo {
 
 #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