Merge remote-tracking branch 'origin/master'

This commit is contained in:
xiang
2026-03-21 20:16:57 +08:00

13
pom.xml
View File

@@ -26,7 +26,6 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<guava.version>16.0.1</guava.version> <guava.version>16.0.1</guava.version>
<mybatis-spring-boot.version>2.3.1</mybatis-spring-boot.version>
<mybatis-plus-spring-boot.version>3.5.14</mybatis-plus-spring-boot.version> <mybatis-plus-spring-boot.version>3.5.14</mybatis-plus-spring-boot.version>
<mysql.version>8.0.33</mysql.version> <mysql.version>8.0.33</mysql.version>
<lombok.version>1.18.30</lombok.version> <lombok.version>1.18.30</lombok.version>
@@ -114,12 +113,12 @@
<version>2.18.0</version> <version>2.18.0</version>
</dependency> </dependency>
<!-- 分页插件 --> <!-- 分页插件 与mp冲突 mp3.5.14需要新版本 而pagehelper的插件使用的是老版本的mybatis -->
<dependency> <!-- <dependency>-->
<groupId>com.github.pagehelper</groupId> <!-- <groupId>com.github.pagehelper</groupId>-->
<artifactId>pagehelper-spring-boot-starter</artifactId> <!-- <artifactId>pagehelper-spring-boot-starter</artifactId>-->
<version>1.4.7</version> <!-- <version>1.4.7</version>-->
</dependency> <!-- </dependency>-->
<!-- 对象转换 --> <!-- 对象转换 -->
<dependency> <dependency>