From 0358dc233a46363d7864d882e0146e56d10ffb27 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 十月 2022 13:02:52 +0800
Subject: [PATCH] update springboot 2.7.4 => 2.7.5 update springboot-admin 2.7.5 => 2.7.6 update springdoc 1.6.11 => 1.6.12 update poi 5.2.2 => 5.2.3 update hutool 5.8.7=>5.8.8 update aws-s3 1.12.300 => 1.12.324 update aliyun-sms 2.0.18 => 2.0.22 update tencent-sms 3.1.591 => 3.1.611
---
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