opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-21 02:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !195 from 梁剑锋/dev

Browse Source
This commit is contained in:
梁剑锋 2022-07-12 07:43:25 +00:00 committed by Gitee
commit 275e94806f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-generator/src/main/resources/vm/java/bo.java.vm
View File

@ -2,8 +2,6 @@ package ${packageName}.domain.bo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.*; import javax.validation.constraints.*;
@ -33,6 +31,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel("${functionName}业务对象")
public class ${ClassName}Bo extends ${Entity} { public class ${ClassName}Bo extends ${Entity} {
#foreach ($column in $columns) #foreach ($column in $columns)
@ -48,12 +47,14 @@ public class ${ClassName}Bo extends ${Entity} {
#set($Group="EditGroup.class") #set($Group="EditGroup.class")
#end #end
#if($column.isRequired == 1) #if($column.isRequired == 1)
@ApiModelProperty(value = "$column.columnComment", required = true)
#if($column.javaType == 'String') #if($column.javaType == 'String')
@NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
#else #else
@NotNull(message = "$column.columnComment不能为空", groups = { $Group }) @NotNull(message = "$column.columnComment不能为空", groups = { $Group })
#end #end
#else #else
@ApiModelProperty(value = "$column.columnComment")
#end #end
private $column.javaType $column.javaField; private $column.javaType $column.javaField;

4
ruoyi-generator/src/main/resources/vm/java/vo.java.vm
View File

@ -7,8 +7,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.convert.ExcelDictConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -21,6 +19,7 @@ import java.util.Date;
* @date ${datetime} * @date ${datetime}
*/ */
@Data @Data
@ApiModel("${functionName}视图对象")
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
public class ${ClassName}Vo { public class ${ClassName}Vo {
@ -46,6 +45,7 @@ public class ${ClassName}Vo {
#else #else
@ExcelProperty(value = "${comment}") @ExcelProperty(value = "${comment}")
#end #end
@ApiModelProperty("$column.columnComment")
private $column.javaType $column.javaField; private $column.javaType $column.javaField;
#end #end