From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 f14d914..489723e 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -1,9 +1,12 @@
package ${packageName}.domain.vo;
-import com.ruoyi.common.annotation.Excel;
#foreach ($import in $importList)
import ${import};
#end
+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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,18 +22,13 @@
*/
@Data
@ApiModel("${functionName}瑙嗗浘瀵硅薄")
+@ExcelIgnoreUnannotated
public class ${ClassName}Vo {
private static final long serialVersionUID = 1L;
- /**
- * $pkColumn.columnComment
- */
- @ApiModelProperty("$pkColumn.columnComment")
- private ${pkColumn.javaType} ${pkColumn.javaField};
-
#foreach ($column in $columns)
-#if($column.isList && $column.isPk!=1)
+#if($column.isList)
/**
* $column.columnComment
*/
@@ -40,12 +38,14 @@
#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")
+#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;
--
Gitblit v1.9.3