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/addBo.java.vm | 9 +++++++++ 1 files changed, 9 insertions(+), 0 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 2e1c4a8..98a1497 100644 --- a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm @@ -2,8 +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) @@ -27,6 +29,13 @@ #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