From 125a278eef54f76f9ca243e0ce388355bc6f051f Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 16 Aug 2022 16:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../like-generator/src/main/resources/java/validate.java.vm  | 5 +----
 .../like-generator/src/main/resources/java/voDetail.java.vm  | 2 +-
 server/like-generator/src/main/resources/java/voList.java.vm | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm
index 856dbcdb..21840b84 100644
--- a/server/like-generator/src/main/resources/java/validate.java.vm
+++ b/server/like-generator/src/main/resources/java/validate.java.vm
@@ -24,11 +24,8 @@ public class ${EntityName}Param implements Serializable {
     public interface update{}
     public interface delete{}
 
-    @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class})
-    private Integer id;
-
 #foreach ($column in $columns)
-  #if(($column.isInsert || $column.isEdit) && $column.javaField!="id")
+  #if($column.isInsert || $column.isEdit || $column.isPk==1)
     #if($column.isPk)
     @IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class})
     #end
diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm
index 1cf85a3c..65b2870c 100644
--- a/server/like-generator/src/main/resources/java/voDetail.java.vm
+++ b/server/like-generator/src/main/resources/java/voDetail.java.vm
@@ -13,7 +13,7 @@ public class ${EntityName}DetailVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.isEdit==1)
+#if($column.isEdit==1 || $column.isPk==1)
     #if($dateFields.contains($column.columnName))
     private String ${column.javaField}; // ${column.columnComment}
     #else
diff --git a/server/like-generator/src/main/resources/java/voList.java.vm b/server/like-generator/src/main/resources/java/voList.java.vm
index 718284ca..45180d89 100644
--- a/server/like-generator/src/main/resources/java/voList.java.vm
+++ b/server/like-generator/src/main/resources/java/voList.java.vm
@@ -13,7 +13,7 @@ public class ${EntityName}ListVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.isList==1)
+#if($column.isList==1 || $column.isPk==1)
     #if($dateFields.contains($column.columnName))
     private String ${column.javaField}; // ${column.columnComment}
     #else