From 844d3ce52f97127b761aec760bd6d6f81e72817e Mon Sep 17 00:00:00 2001
From: hebo <13216192626@163.com>
Date: Mon, 13 Sep 2021 20:06:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90-?=
 =?UTF-8?q?=E5=BD=93=E8=A1=A8=E6=9C=AA=E8=AE=BE=E7=BD=AE=E4=B8=BB=E9=94=AE?=
 =?UTF-8?q?=E6=97=B6=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 8 +-------
 1 file changed, 1 insertion(+), 7 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 e97cd2467..2f78eec53 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -27,14 +27,8 @@ 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.isPk!=1 || $column.isPk==1)
     /**
      * $column.columnComment
      */

From 273fddbf8b289e0681c2872eef8af4fb968fa2f1 Mon Sep 17 00:00:00 2001
From: dawn9117 <silanglang@163.com>
Date: Mon, 13 Sep 2021 12:16:05 +0000
Subject: [PATCH 2/2] update
 ruoyi-generator/src/main/resources/vm/java/vo.java.vm.

---
 ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2f78eec53..2d6e3c259 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -28,7 +28,7 @@ public class ${ClassName}Vo {
 	private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.isList && $column.isPk!=1 || $column.isPk==1)
+#if($column.isList || $column.isPk==1)
     /**
      * $column.columnComment
      */