From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 09:59:19 +0800
Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 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 4641d78..983c29c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -1,12 +1,12 @@
-package ${packageName}.vo;
+package ${packageName}.domain.vo;
-import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
#foreach ($import in $importList)
import ${import};
#end
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
@@ -19,34 +19,32 @@
* @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)
- /** $column.columnComment */
+#if($column.isList)
+ /**
+ * $column.columnComment
+ */
#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
#else
#set($comment=$column.columnComment)
#end
-#if($parentheseIndex != -1)
- @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
- @Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+#if(${column.dictType} && ${column.dictType} != '')
+ @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "${column.dictType}")
+#elseif($parentheseIndex != -1)
+ @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
#else
- @Excel(name = "${comment}")
+ @ExcelProperty(value = "${comment}")
#end
- @ApiModelProperty("$column.columnComment")
- private $column.javaType $column.javaField;
+ private $column.javaType $column.javaField;
#end
#end
--
Gitblit v1.9.3