Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

 pom.xml

@@ -21,6 +21,7 @@
        <springfox-swagger.version>2.9.2</springfox-swagger.version>
        <io.swagger.version>1.5.22</io.swagger.version>
        <base.version>1.0-SNAPSHOT</base.version>
        <mybatis-plus.version>3.4.1</mybatis-plus.version>
    </properties>

    <dependencies>
@@ -55,6 +56,8 @@
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <version>1.18.20</version>
            <scope>provided</scope>
            <optional>true</optional>
        </dependency>

@@ -259,6 +262,14 @@
            <artifactId>aspectjweaver</artifactId>
            <version>1.9.7</version>
        </dependency>

        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson</artifactId>
            <version>3.15.6</version>
        </dependency>


    </dependencies>

    <build>