From 9db10a9a5845b7c5ad85fec1426bf5eed266e2ae Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Mon, 15 Mar 2021 17:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ink/wgink/code/factory/service/GenerateService.java   | 8 ++++----
 src/main/resources/template/normal/pojo/bo.ftl            | 7 +------
 src/main/resources/template/normal/pojo/po.ftl            | 7 +------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/ink/wgink/code/factory/service/GenerateService.java b/src/main/java/ink/wgink/code/factory/service/GenerateService.java
index 660eb23..25d7f17 100644
--- a/src/main/java/ink/wgink/code/factory/service/GenerateService.java
+++ b/src/main/java/ink/wgink/code/factory/service/GenerateService.java
@@ -118,10 +118,10 @@ public class GenerateService {
         if (generateVO.getHasRoute()) {
             routeCode("/normal/controller/route-controller.ftl", String.format("%s/controller/route/%s", outFolder, lowerTableName), firstUpperTableName, dataModel);
         }
-        boCode("/normal/pojo/bo.ftl", String.format("%s/pojo/bos", outFolder, lowerTableName), firstUpperTableName, dataModel);
-        dtoCode("/normal/pojo/dto.ftl", String.format("%s/pojo/dtos", outFolder, lowerTableName), firstUpperTableName, dataModel);
-        poCode("/normal/pojo/po.ftl", String.format("%s/pojo/pos", outFolder, lowerTableName), firstUpperTableName, dataModel);
-        voCode("/normal/pojo/vo.ftl", String.format("%s/pojo/vos", outFolder, lowerTableName), firstUpperTableName, dataModel);
+        boCode("/normal/pojo/bo.ftl", String.format("%s/pojo/bos/%s", outFolder, lowerTableName), firstUpperTableName, dataModel);
+        dtoCode("/normal/pojo/dto.ftl", String.format("%s/pojo/dtos/%s", outFolder, lowerTableName), firstUpperTableName, dataModel);
+        poCode("/normal/pojo/po.ftl", String.format("%s/pojo/pos/%s", outFolder, lowerTableName), firstUpperTableName, dataModel);
+        voCode("/normal/pojo/vo.ftl", String.format("%s/pojo/vos/%s", outFolder, lowerTableName), firstUpperTableName, dataModel);
         MsgUtil.alert(Alert.AlertType.CONFIRMATION, "生成成功");
     }
 
diff --git a/src/main/resources/template/normal/pojo/bo.ftl b/src/main/resources/template/normal/pojo/bo.ftl
index 55f3ff9..f4b0417 100644
--- a/src/main/resources/template/normal/pojo/bo.ftl
+++ b/src/main/resources/template/normal/pojo/bo.ftl
@@ -1,9 +1,4 @@
-package ${codePackage}.pojo.vos.${lowerTableName};
-
-import ink.wgink.annotation.CheckEmptyAnnotation;
-import ink.wgink.annotation.CheckNumberAnnotation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+package ${codePackage}.pojo.bos.${lowerTableName};
 
 /**
  *
diff --git a/src/main/resources/template/normal/pojo/po.ftl b/src/main/resources/template/normal/pojo/po.ftl
index 746b313..8f8f0b3 100644
--- a/src/main/resources/template/normal/pojo/po.ftl
+++ b/src/main/resources/template/normal/pojo/po.ftl
@@ -1,9 +1,4 @@
-package ${codePackage}.pojo.vos.${lowerTableName};
-
-import ink.wgink.annotation.CheckEmptyAnnotation;
-import ink.wgink.annotation.CheckNumberAnnotation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+package ${codePackage}.pojo.pos.${lowerTableName};
 
 /**
  *