Merge branch 'hive2.0' into api

935090232@qq.com

2021-01-26 ae2efe9a1b627fcfbe61020e9e0a82470a3959d7

 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>config/config.json</exclude>
                         <exclude>config/application.properties</exclude>
                         <exclude>config/system.properties</exclude>

                    -->


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