From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/pom.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/pom.xml b/server/pom.xml
index 95012c9..9be2e51 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -30,7 +30,7 @@
     <swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
     <fastjson.version>1.2.70</fastjson.version>
     <druid.version>1.2.0</druid.version>
-    <mybatis.plus.version>3.4.2</mybatis.plus.version>
+    <mybatis.plus.version>3.5.7</mybatis.plus.version>
     <apache.shiro.version>1.7.0</apache.shiro.version>
     <oshi.version>5.7.0</oshi.version>
     <jna.version>5.7.0</jna.version>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.github.pagehelper</groupId>
       <artifactId>pagehelper-spring-boot-starter</artifactId>
-      <version>1.3.0</version>
+      <version>2.1.0</version>
       <!--浣跨敤spring boot2鏁村悎 pagehelper-spring-boot-starter蹇呴』鎺掗櫎涓�涓嬩緷璧�
           鍥犱负pagehelper-spring-boot-starter涔熷凡缁忓湪pom渚濊禆浜唌ybatis涓巑ybatis-spring
           鎵�浠ヤ細涓巑ybatis-plus-boot-starter涓殑mybatis涓巑ybatis-spring鍙戠敓鍐茬獊

--
Gitblit v1.9.3