From 0d02ee0aeeaa7c4df579a57b6f75e59c69a1ed26 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:22:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-generator/src/main/java/com/ycl/MysqlGenerator.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java b/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
index 899b392..2c899e7 100644
--- a/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
+++ b/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
@@ -11,7 +11,7 @@
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-import com.ycl.base.BaseController;
+import com.ycl.controller.BaseController;
import java.util.ArrayList;
@@ -57,9 +57,9 @@
// 鍏ㄥ眬閰嶇疆
GlobalConfig gc = new GlobalConfig();
- String projectPath = System.getProperty("user.dir");
+ final String projectPath = System.getProperty("user.dir");
gc.setOutputDir(projectPath + "/ycl-generator/src/main/java");
- gc.setAuthor("wl");//浣滆��
+ gc.setAuthor("lyq");//浣滆��
gc.setBaseResultMap(true); //mapper.xml 鐢熸垚 ResultMap
gc.setBaseColumnList(true); //mapper.xml 鐢熸垚 ColumnList
// gc.setSwagger2(true);
@@ -83,7 +83,7 @@
// pc.setModuleName(scanner("妯″潡鍚�"));
pc.setModuleName(null);
pc.setParent("com.ycl");
- String packageName = scanner("璇疯緭鍏ュ寘鍚�");
+ final String packageName = scanner("璇疯緭鍏ュ寘鍚�");
//鑷畾涔夋墍鍦ㄥ寘鐨勫悕绉� 鍩烘湰娌″繀瑕�
pc.setEntity(PN_ENTITY + PN_DELIMITER + packageName);
pc.setController(PN_CONTROLLER + PN_DELIMITER + packageName);
@@ -108,7 +108,7 @@
// String templatePath = "/templates/mapper.xml.vm";
// 鑷畾涔夎緭鍑洪厤缃�
- List<FileOutConfig> focList = new ArrayList<>();
+ List<FileOutConfig> focList = new ArrayList<FileOutConfig>();
// 鑷畾涔夐厤缃細琚紭鍏堣緭鍑�
focList.add(new FileOutConfig(templatePath) {
@Override
@@ -158,7 +158,7 @@
//鍘婚櫎瀛楁鍓嶇紑
strategy.setFieldPrefix("");
- List<TableFill> tableFills = new ArrayList<>();
+ List<TableFill> tableFills = new ArrayList<TableFill>();
TableFill createTimeFill = new TableFill("createTime", FieldFill.INSERT);
TableFill modifiedTimeFill = new TableFill("modifiedTime", FieldFill.UPDATE);
--
Gitblit v1.8.0