Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-26 36e3950ade8195a7d2fcea64c5118e3ddeec8c44

 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>

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