Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
caa81d1f4d
|
@ -143,6 +143,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
|
|||
.set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
|
||||
.set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
|
||||
.set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
|
||||
.set(cenTableColumn.getIsRequired() == null, GenTableColumn::getIsRequired, null)
|
||||
.eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
|
||||
}
|
||||
}
|
||||
|
@ -458,4 +459,4 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
|
|||
}
|
||||
return genPath + File.separator + VelocityUtils.getFileName(template, table);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,10 +29,12 @@ public class ${ClassName}AddBo {
|
|||
#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
|
||||
|
|
|
@ -29,10 +29,12 @@ public class ${ClassName}EditBo {
|
|||
#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
|
||||
|
|
Loading…
Reference in New Issue