From a680a84d91fb6501951d0265e9b347695568c546 Mon Sep 17 00:00:00 2001 From: 抓蛙师 <770492966@qq.com> Date: 星期二, 20 九月 2022 16:41:40 +0800 Subject: [PATCH] !236 前端适配多字段排序功能案例OSS页面(重新排序需点击重置按钮,否则按照点击顺序依次排序,重复点击的字段排序位置不发生改变) * 完善前端适配多字段排序功能案例OSS页面(完善排序图标显示效果和重置效果,支持正序,倒序,取消排序) * 前端适配多字段排序功能案例OSS页面(重新排序需点击重置按钮,否则按照点击顺序依次排序,重复点击的字段排序位置不发生改变) --- ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm index e717f2f..983c29c 100644 --- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm @@ -7,8 +7,6 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -21,20 +19,13 @@ * @date ${datetime} */ @Data -@ApiModel("${functionName}瑙嗗浘瀵硅薄") @ExcelIgnoreUnannotated public class ${ClassName}Vo { - private static final long serialVersionUID = 1L; -#if($pkColumn.isPk == 1) - /** - * $pkColumn.columnComment - */ - @ApiModelProperty("$pkColumn.columnComment") - private ${pkColumn.javaType} ${pkColumn.javaField}; -#end + private static final long serialVersionUID = 1L; + #foreach ($column in $columns) -#if($column.isList && $column.isPk!=1) +#if($column.isList) /** * $column.columnComment */ @@ -48,13 +39,12 @@ @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "${column.dictType}") #elseif($parentheseIndex != -1) - @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") #else - @ExcelProperty(value = "${comment}") + @ExcelProperty(value = "${comment}") #end - @ApiModelProperty("$column.columnComment") - private $column.javaType $column.javaField; + private $column.javaType $column.javaField; #end #end -- Gitblit v1.9.3