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

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

@@ -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);
     }
-}
+}

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

@@ -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

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

@@ -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