Merge branch 'developer'

Helius

2022-02-22 50199492d4033f995223c94fdb65297bb13c4505

 zq-erp/pom.xml

@@ -48,6 +48,12 @@
            </properties>
        </profile>
        <profile>
            <id>mdprd</id>
            <properties>
                <env>mdprd</env>
            </properties>
        </profile>
        <profile>
            <id>xcx</id>
            <properties>
                <env>xcx</env>
@@ -387,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>
@@ -397,16 +408,15 @@

                    <exclude>config/dev/*</exclude>
                    <exclude>config/prd/*</exclude>
                    <exclude>config/mdprd/*</exclude>
                    <exclude>config/test/*</exclude>
                    <exclude>config/xcx/*</exclude>
                    <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>
@@ -421,6 +431,7 @@
                    <include>**/*.woff2</include>
                    <include>**/*.ttf</include>
                    <include>**/*.xls</include>
                    <include>**/*.xml</include>
                </includes>
            </resource>
            <resource>