From 63328dd80adc6331db581dda6418308e6fd4da12 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:50:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/CodeGenerator.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/CodeGenerator.java b/src/main/java/com/ruoyi/CodeGenerator.java
index ccd51ca..9e75ced 100644
--- a/src/main/java/com/ruoyi/CodeGenerator.java
+++ b/src/main/java/com/ruoyi/CodeGenerator.java
@@ -23,7 +23,7 @@
     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 = "quality"; // 妯″潡
     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