From 2005df45cd8913a703f4f3019cf624198db8b5b3 Mon Sep 17 00:00:00 2001
From: Ky10 <7703482+ky10_code@user.noreply.gitee.com>
Date: Wed, 24 Jul 2024 18:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9Bbug=E3=80=82=E4=BF=9D=E8=AF=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E8=BF=90=E8=A1=8C=E8=B5=B7=E6=9D=A5=E3=80=82?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=83=A8=E5=88=86=E3=80=82=E4=B8=80=E4=BA=9B=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/youlai/system/model/form/GenConfigForm.java | 2 ++
 src/main/resources/templates/generator/controller.java.vm     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/youlai/system/model/form/GenConfigForm.java b/src/main/java/com/youlai/system/model/form/GenConfigForm.java
index a561a8ba..b37f1261 100644
--- a/src/main/java/com/youlai/system/model/form/GenConfigForm.java
+++ b/src/main/java/com/youlai/system/model/form/GenConfigForm.java
@@ -35,6 +35,8 @@ public class GenConfigForm {
     @Schema(description = "字段配置")
     @Data
     public static class FieldConfig {
+        @Schema(description = "ID")
+        private Long configId;
 
         @Schema(description = "列名")
         private String columnName;
diff --git a/src/main/resources/templates/generator/controller.java.vm b/src/main/resources/templates/generator/controller.java.vm
index 292830e4..4b3305be 100644
--- a/src/main/resources/templates/generator/controller.java.vm
+++ b/src/main/resources/templates/generator/controller.java.vm
@@ -7,8 +7,8 @@ import ${package}.model.form.${entityName}Form;
 import ${package}.model.query.${entityName}PageQuery;
 import ${package}.model.vo.${entityName}PageVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.youlai.common.result.PageResult;
-import com.youlai.common.result.Result;
+import com.youlai.system.common.result.PageResult;
+import com.youlai.system.common.result.Result;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;