Merge branch 'api' into hive2.0

jyy

2021-01-26 ec0c71cc88407098e0c088dbf1e44cddf856b8f8

 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>

                    -->