From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 489723e..216e90f 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -25,7 +25,7 @@
@ExcelIgnoreUnannotated
public class ${ClassName}Vo {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
#if($column.isList)
@@ -42,13 +42,13 @@
@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;
+ @ApiModelProperty("$column.columnComment")
+ private $column.javaType $column.javaField;
#end
#end
--
Gitblit v1.9.3