From ac47375aba17033ace1791bdebb5f5bb7d343827 Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: 星期四, 17 三月 2022 11:45:42 +0800
Subject: [PATCH] fix 修复角色、岗位、字典数据在PostgreSQL执行插入或者更新SQL报错问题，修改对应实体类的排序属性为Integer类型。
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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..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,16 +25,10 @@
@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 +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