From 2027dae30b82365a84988d057c2a9240d233971c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 04 六月 2021 16:12:43 +0800 Subject: [PATCH] !49 同步dev分支 Merge pull request !49 from 疯狂的狮子Li/dev --- ruoyi-generator/src/main/resources/vm/java/editBo.java.vm | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 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 8144f62..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,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) import ${import}; @@ -24,6 +26,16 @@ /** $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