merge conflict origin/master

2022-02-09 16:52:28 +08:00
parent bbe3399c90 a4ee4df71b
commit 4dc183cdf5
6 changed files with 45 additions and 19 deletions
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -165,6 +165,12 @@
            <artifactId>jasypt-spring-boot-starter</artifactId>
            <version>${jasypt-version}</version>
        </dependency>
+
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson</artifactId>
+            <version>${redisson}</version>
+        </dependency>
        <!-- 阿里云核心包-->
        <dependency>
            <groupId>com.aliyun</groupId>