Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2020-12-09 95cdd1c5f86bf7ec5af17a07d819976a0365b5d7

 zq-erp/pom.xml

@@ -53,6 +53,12 @@
                <env>xcx</env>
            </properties>
        </profile>
        <profile>
            <id>lhx</id>
            <properties>
                <env>lhx</env>
            </properties>
        </profile>
    </profiles>
    <dependencies>

@@ -348,12 +354,11 @@
                    <exclude>config/test/*</exclude>
                    <exclude>config/xcx/*</exclude>

                    <!--

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



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