From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:04:09 +0800 Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil --- ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 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 e97cd24..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; - - /** - * $pkColumn.columnComment - */ - @ApiModelProperty("$pkColumn.columnComment") - private ${pkColumn.javaType} ${pkColumn.javaField}; + 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