Merge branch 'master' of https://gitee.com/huoxiong/hx_common

ChenJiaHe

2021-12-26 a0fc599f93eeeeb678514492d72bce6b9f47c48e

 pom.xml

@@ -278,10 +278,16 @@
            <artifactId>spring-boot-starter-forest</artifactId>
            <version>1.5.0-RC2</version>
        </dependency>

        <!-- redis -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
    </dependencies>

    <build>
        <finalName>hx-demoboot</finalName>
        <finalName>hx-common</finalName>
        <resources>
            <resource>
                <directory>src/main/java</directory>