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

ChenJiaHe

2021-12-26 a0fc599f93eeeeb678514492d72bce6b9f47c48e

 pom.xml

@@ -287,7 +287,7 @@
    </dependencies>

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