From df2ff592a5b9037a747032f3351836e0c61fb4f9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 08:59:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/CodeGenerator.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/CodeGenerator.java b/src/main/java/com/ruoyi/CodeGenerator.java
index ccd51ca..cca67a2 100644
--- a/src/main/java/com/ruoyi/CodeGenerator.java
+++ b/src/main/java/com/ruoyi/CodeGenerator.java
@@ -19,11 +19,11 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://127.0.0.1:3306/product-inventory-management";
+ public static String database_url = "jdbc:mysql://127.0.0.1:3306/product-inventory-management-new";
public static String database_username = "root";
public static String database_password= "123456";
public static String author = "鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃";
- public static String model = "collaborativeApproval"; // 妯″潡
+ public static String model = "account"; // 妯″潡
public static String setParent = "com.ruoyi."+ model; // 鍖呰矾寰�
public static String tablePrefix = ""; // 璁剧疆杩囨护琛ㄥ墠缂�
public static void main(String[] args) {
@@ -63,7 +63,7 @@
.packageConfig(builder -> {
builder.entity("pojo");
builder.parent(setParent) // 璁剧疆鐖跺寘鍚�
- .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + "/src/main/resources/"+model+"/mapper")); // 璁剧疆mapperXml鐢熸垚璺緞
+ .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + "/src/main/resources/mapper/"+model)); // 璁剧疆mapperXml鐢熸垚璺緞
})
// 绛栫暐閰嶇疆
.strategyConfig(builder -> {
@@ -89,6 +89,8 @@
.mapperBuilder()
.enableFileOverride() // 瑕嗙洊宸茬敓鎴怣apper鏂囦欢
.enableBaseResultMap() // 鑷姩鐢熸垚resultMap
+ .mapperAnnotation(org.apache.ibatis.annotations.Mapper.class)
+
// Service 绛栫暐閰嶇疆
.serviceBuilder()
.formatServiceFileName("%sService") //鏍煎紡鍖� service 鎺ュ彛鏂囦欢鍚嶇О锛�%s杩涜鍖归厤琛ㄥ悕锛屽 UserService
--
Gitblit v1.9.3