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

jyy

2021-01-27 19dc607fe5fd18531d6deaa4fe8540b602585723

 zq-erp/pom.xml

@@ -390,12 +390,12 @@
                    <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>