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

935090232@qq.com

2021-02-05 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece

 zq-erp/pom.xml

@@ -390,11 +390,11 @@
                    <exclude>config/test/*</exclude>
                    <exclude>config/xcx/*</exclude>

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