From ff779cb22ce9d538c8306e9f218ae24a497057b3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 04 七月 2024 10:09:24 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/system_service/pom.xml |   48 +++++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/server/system_service/pom.xml b/server/system_service/pom.xml
index d54b462..22a532c 100644
--- a/server/system_service/pom.xml
+++ b/server/system_service/pom.xml
@@ -18,7 +18,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>
@@ -68,27 +68,33 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.3.0</version>
-            <!--浣跨敤spring boot2鏁村悎 pagehelper-spring-boot-starter蹇呴』鎺掗櫎涓�涓嬩緷璧�
-                鍥犱负pagehelper-spring-boot-starter涔熷凡缁忓湪pom渚濊禆浜唌ybatis涓巑ybatis-spring
-                鎵�浠ヤ細涓巑ybatis-plus-boot-starter涓殑mybatis涓巑ybatis-spring鍙戠敓鍐茬獊
-            -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis-spring</artifactId>
-                </exclusion>
-                <!-- 瑙ｅ喅jsqlparser 渚濊禆鐗堟湰鍐茬獊-->
-                <exclusion>
-                    <artifactId>jsqlparser</artifactId>
-                    <groupId>com.github.jsqlparser</groupId>
-                </exclusion>
-            </exclusions>
+            <version>2.1.0</version>
         </dependency>
+
+        <!-- <dependency>
+             <groupId>com.github.pagehelper</groupId>
+             <artifactId>pagehelper-spring-boot-starter</artifactId>
+             <version>1.3.0</version>
+             &lt;!&ndash;浣跨敤spring boot2鏁村悎 pagehelper-spring-boot-starter蹇呴』鎺掗櫎涓�涓嬩緷璧�
+                 鍥犱负pagehelper-spring-boot-starter涔熷凡缁忓湪pom渚濊禆浜唌ybatis涓巑ybatis-spring
+                 鎵�浠ヤ細涓巑ybatis-plus-boot-starter涓殑mybatis涓巑ybatis-spring鍙戠敓鍐茬獊
+             &ndash;&gt;
+             <exclusions>
+                 <exclusion>
+                     <groupId>org.mybatis</groupId>
+                     <artifactId>mybatis</artifactId>
+                 </exclusion>
+                 <exclusion>
+                     <groupId>org.mybatis</groupId>
+                     <artifactId>mybatis-spring</artifactId>
+                 </exclusion>
+                 &lt;!&ndash; 瑙ｅ喅jsqlparser 渚濊禆鐗堟湰鍐茬獊&ndash;&gt;
+                 &lt;!&ndash;<exclusion>
+                     <artifactId>jsqlparser</artifactId>
+                     <groupId>com.github.jsqlparser</groupId>
+                 </exclusion>&ndash;&gt;
+             </exclusions>
+         </dependency>-->
         <!-- 杩炴帴姹� -->
         <dependency>
             <groupId>com.alibaba</groupId>

--
Gitblit v1.9.3