diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
index b8a10b7b..37bbbd37 100644
--- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
+++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
@@ -372,7 +372,7 @@ public class GenerateServiceImpl implements IGenerateService {
             Template tpl = Velocity.getTemplate(template, GenConstants.UTF8);
             tpl.merge(context, sw);
             map.put(template.replace(".vm", ""), sw.toString());
-            System.out.println(sw);
+            // System.out.println(sw);
         }
 
         return map;
diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
index 7606fd87..b0f55d36 100644
--- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
+++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
@@ -61,7 +61,7 @@ public class VelocityUtil {
             if (column.getIsPk() == 1) {
                 primaryKey = column.getJavaField();
             }
-            if (StringUtil.isNotEmpty(column.getDictType())) {
+            if (StringUtil.isNotEmpty(column.getDictType()) && !dictFields.contains(column.getDictType())) {
                 dictFields.add(column.getDictType());
             }
         }
@@ -83,7 +83,7 @@ public class VelocityUtil {
         velocityContext.put("allFields", allFields);
         velocityContext.put("listFields", listFields);
         velocityContext.put("detailFields", detailFields);
-        velocityContext.put("dictFields", ArrayUtil.listToStringByStr(dictFields,","));
+        velocityContext.put("dictFields", dictFields);
         velocityContext.put("isSearch", isSearch);
         return velocityContext;
     }
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 9070f898..21840b84 100644
--- a/server/like-generator/src/main/resources/java/validate.java.vm
+++ b/server/like-generator/src/main/resources/java/validate.java.vm
@@ -25,7 +25,7 @@ public class ${EntityName}Param implements Serializable {
     public interface delete{}
 
 #foreach ($column in $columns)
-  #if($column.isInsert || $column.isEdit)
+  #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
diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
index 0976334b..b2a9768e 100644
--- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
@@ -159,15 +159,14 @@
             loading.value = false
         }
     }
+    #if($dictFields.size()>=1)
+    #set($dictSize = $dictFields.size() - 1)
 
-    #if($dictFields!="")
     const { dictData } = useDictData<{
-        #foreach ($column in $columns)
-        #if($column.dictType!="")
-        ${column.dictType}: any[]
-        #end
-        #end
-    }>([${dictFields}])
+    #foreach ($dict in $dictFields)
+        ${dict}: any[]
+    #end
+    }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end])
     #end
 
     const handleAdd = async (${table.treePrimary}?: number) => {
diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm
index 0d80baed..74843b0e 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -151,15 +151,14 @@
         fetchFun: ${moduleName}Lists,
         params: queryParams
     })
+    #if($dictFields.size()>=1)
+    #set($dictSize = $dictFields.size() - 1)
 
-    #if($dictFields!="")
     const { dictData } = useDictData<{
-        #foreach ($column in $columns)
-        #if($column.dictType!="")
-        ${column.dictType}: any[]
+        #foreach ($dict in $dictFields)
+        ${dict}: any[]
         #end
-        #end
-    }>([${dictFields}])
+    }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end])
     #end
 
     const selectData = ref<any[]>([])