Merge branch 'hive2.0' of https://gitee.com/jyyforjava/zq-erp into hive2.0

Helius

2020-12-09 74ca49871c6edbd47c2014de126fee0d6971f760

 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>

@@ -367,6 +373,7 @@
                    <include>**/*.woff</include>
                    <include>**/*.woff2</include>
                    <include>**/*.ttf</include>
                    <include>**/*.xls</include>
                </includes>
            </resource>
            <resource>