From a329e31d55afcdf954b2b2d6195eb78e2e88038d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=87=C2=B0?= <990130556@qq.com>
Date: Sat, 19 Nov 2022 16:01:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?seata=E4=BE=9D=E8=B5=96=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-common/ruoyi-common-seata/pom.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml
index 3137110b..49fe78f4 100644
--- a/ruoyi-common/ruoyi-common-seata/pom.xml
+++ b/ruoyi-common/ruoyi-common-seata/pom.xml
@@ -21,7 +21,17 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>
-</project>
\ No newline at end of file
+</project>

From 8a99ac87ad19e0d4ec0341aebdc006ef95295fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=87=C2=B0?= <990130556@qq.com>
Date: Mon, 3 Apr 2023 13:43:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?dynamic-datasource-spring-boot-starter?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B03.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b613ba96..7322d9a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
         <druid.version>1.2.16</druid.version>
-        <dynamic-ds.version>3.5.2</dynamic-ds.version>
+        <dynamic-ds.version>3.6.1</dynamic-ds.version>
         <commons.io.version>2.11.0</commons.io.version>
         <velocity.version>2.3</velocity.version>
         <fastjson.version>2.0.25</fastjson.version>
@@ -282,4 +282,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>