From 662251e208e58a9940efb200457c49ed342cd06f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 14 九月 2021 10:16:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 4 ++--
1 files changed, 2 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 e97cd24..e717f2f 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -26,13 +26,13 @@
public class ${ClassName}Vo {
private static final long serialVersionUID = 1L;
-
+#if($pkColumn.isPk == 1)
/**
* $pkColumn.columnComment
*/
@ApiModelProperty("$pkColumn.columnComment")
private ${pkColumn.javaType} ${pkColumn.javaField};
-
+#end
#foreach ($column in $columns)
#if($column.isList && $column.isPk!=1)
/**
--
Gitblit v1.9.3