From c94be8aa5d4c4e8ebbf1d3a6cb106d324b4eaf79 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Thu, 22 Aug 2024 11:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BE=9D=E8=B5=96=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 ruoyi   |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0e6a05b..acdbacc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,43 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.gunshi</groupId>
+                <artifactId>gunshi-boot</artifactId>
+                <version>1.4-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.baomidou</groupId>
+                        <artifactId>mybatis-plus</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.baomidou</groupId>
+                        <artifactId>mybatis-plus-boot-starter</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>com.gunshi</groupId>
+            <artifactId>gunshi-db</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <version>3.5.7</version>
+        </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -113,6 +149,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
         </dependency>
+
         <!--        <dependency>-->
         <!--            <groupId>org.springframework.boot</groupId>-->
         <!--            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>-->
@@ -160,6 +197,18 @@
                     <artifactId>springfox-swagger2</artifactId>
                     <groupId>io.springfox</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>jsqlparser</artifactId>
+                    <groupId>com.github.jsqlparser</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>mybatis</artifactId>
+                    <groupId>org.mybatis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+                    <groupId>com.baomidou</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/ruoyi b/ruoyi
index d456ff1..96443a2 160000
--- a/ruoyi
+++ b/ruoyi
@@ -1 +1 @@
-Subproject commit d456ff189647e16ffaaa170738d785eeee1253c0
+Subproject commit 96443a2e8120e40b58b4a2949505ae9ac8344990