Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-05-24 caa81d1f4dbb0f608b7a6848e673eca2c4a69d10

Merge remote-tracking branch 'origin/dev' into dev

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -143,6 +143,7 @@
                                .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 @@
        }
        return genPath + File.separator + VelocityUtils.getFileName(template, table);
    }
}
}

 ruoyi-generator/src/main/resources/vm/java/addBo.java.vm

@@ -29,11 +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

 ruoyi-generator/src/main/resources/vm/java/editBo.java.vm

@@ -29,11 +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