发布 v2.5.2

ruoyi/src/main/resources/vm/java/controller.java.vm

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation;
  * @author ${author}
  * @date ${datetime}
  */
+@Validated
 @Api(value = "${functionName}控制器", tags = {"${functionName}管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController

ruoyi/src/main/resources/vm/java/domain.java.vm

@@ -24,7 +24,9 @@ public class ${ClassName} implements Serializable {
 
 #foreach ($column in $columns)
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
 #if($column.javaField=="createBy"||$column.javaField=="createTime")
     @TableField(fill = FieldFill.INSERT)
 #end

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

@@ -23,7 +23,9 @@ public class ${ClassName}EditBo {
 #foreach ($column in $columns)
 #if($column.isEdit || $column.isPk==1)
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
 #if($column.isRequired==1)
 #if($column.javaType == 'String')

ruoyi/src/main/resources/vm/java/queryBo.java.vm

@@ -33,23 +33,33 @@ import com.ruoyi.common.core.domain.TreeEntity;
 @ApiModel("${functionName}分页查询对象")
 public class ${ClassName}QueryBo extends ${Entity} {
 
-	/** 分页大小 */
+	/**
+	 * 分页大小
+	 */
 	@ApiModelProperty("分页大小")
 	private Integer pageSize;
-	/** 当前页数 */
+	/**
+	 * 当前页数
+	 */
 	@ApiModelProperty("当前页数")
 	private Integer pageNum;
-	/** 排序列 */
+	/**
+	 * 排序列
+	 */
 	@ApiModelProperty("排序列")
 	private String orderByColumn;
-	/** 排序的方向desc或者asc */
+	/**
+	 * 排序的方向desc或者asc
+	 */
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
 
 
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField) && $column.query)
-	/** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
 	@ApiModelProperty("$column.columnComment")
 	private $column.javaType $column.javaField;
 #end

ruoyi/src/main/resources/vm/java/vo.java.vm

@@ -23,13 +23,17 @@ public class ${ClassName}Vo {
 
 	private static final long serialVersionUID = 1L;
 
-	/** $pkColumn.columnComment */
+	/**
+     *  $pkColumn.columnComment
+     */
 	@ApiModelProperty("$pkColumn.columnComment")
 	private ${pkColumn.javaType} ${pkColumn.javaField};
 
 #foreach ($column in $columns)
 #if($column.isList && $column.isPk!=1)
-	/** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))

ruoyi/src/main/resources/vm/vue/index-tree.vue.vm

@@ -105,7 +105,7 @@
           <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-#elseif($column.list && "" != $column.dictType)
+#elseif($column.list && $column.dictType && "" != $column.dictType)
       <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
 #elseif($column.list && "" != $javaField)
 #if(${foreach.index} == 1)

ruoyi/src/main/resources/vm/vue/index.vue.vm

@@ -134,7 +134,7 @@
           <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-#elseif($column.list && "" != $column.dictType)
+#elseif($column.list && $column.dictType && "" != $column.dictType)
       <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
 #elseif($column.list && "" != $javaField)
       <el-table-column label="${comment}" align="center" prop="${javaField}" />