Merge branch 'developer'

Helius

2022-02-22 50199492d4033f995223c94fdb65297bb13c4505

 zq-erp/pom.xml

@@ -393,6 +393,11 @@
            <artifactId>hutool-all</artifactId>
            <version>5.3.1</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
            <version>26.0-jre</version>
        </dependency>
    </dependencies>
    <build>
        <resources>
@@ -409,11 +414,9 @@
                    <exclude>config/xcshop/*</exclude>

                    <!--  -->

                    <exclude>config/config.json</exclude>
                    <exclude>config/application.properties</exclude>
                    <exclude>config/system.properties</exclude>


                    <exclude>**/*.woff</exclude>
                    <exclude>**/*.woff2</exclude>