From 4c0bd42a9f5989f93df221bd760b5d831f1c6464 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 29 五月 2025 11:43:41 +0800
Subject: [PATCH] Merge branch 'master' of http://gitea.lunor.cn/java_templates/ruoyi_java into chen
---
pom.xml | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7ec3d8a..6f6211f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<jakarta.version>6.0.0</jakarta.version>
<springdoc.version>2.6.0</springdoc.version>
<postgresql.version>42.7.3</postgresql.version>
- <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
+ <mybatis-plus.version>3.5.12</mybatis-plus.version>
<freemarker.version>2.3.30</freemarker.version>
<minio.version>8.4.3</minio.version>
<okhttp.version>4.9.0</okhttp.version>
@@ -156,13 +156,6 @@
<version>${ruoyi.version}</version>
</dependency>
- <!-- 浠ｇ爜鐢熸垚-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>${ruoyi.version}</version>
- </dependency>
-
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -227,10 +220,17 @@
<scope>provided</scope>
</dependency>
+ <!-- MyBatis-Plus 鏍稿績渚濊禆 -->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-core</artifactId>
+ <version>3.5.12</version> <!-- 涓庝綘鐨� Spring Boot 鍏煎鐨勭増鏈� -->
+ </dependency>
+
<!--mybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
@@ -254,7 +254,6 @@
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
<module>ruoyi-quartz</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>basic-server</module>
</modules>
--
Gitblit v1.9.3