From 2103731f104c4b98ef596be50ff1dd972b4f6000 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 10 六月 2021 09:44:56 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 7 +++++--
1 files changed, 5 insertions(+), 2 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 8546f5c..4641d78 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -8,11 +8,12 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
/**
- * ${functionName}瑙嗗浘瀵硅薄 mall_package
+ * ${functionName}瑙嗗浘瀵硅薄 ${tableName}
*
* @author ${author}
* @date ${datetime}
@@ -20,6 +21,7 @@
@Data
@ApiModel("${functionName}瑙嗗浘瀵硅薄")
public class ${ClassName}Vo {
+
private static final long serialVersionUID = 1L;
/** $pkColumn.columnComment */
@@ -27,7 +29,7 @@
private ${pkColumn.javaType} ${pkColumn.javaField};
#foreach ($column in $columns)
-#if($column.isList)
+#if($column.isList && $column.isPk!=1)
/** $column.columnComment */
#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
#if($parentheseIndex != -1)
@@ -45,6 +47,7 @@
#end
@ApiModelProperty("$column.columnComment")
private $column.javaType $column.javaField;
+
#end
#end
--
Gitblit v1.9.3