Merge branch 'api' into hive2.0

Helius

2021-03-30 f7bfb2fad02329213b3264f146172ed0b2f3e8a3

 zq-erp/pom.xml

@@ -391,10 +391,10 @@
                    <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>