Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-25 4ade37283f06a39057992828e13058ef804ae606

 zq-erp/pom.xml

@@ -386,12 +386,12 @@

                    <!--

                       <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>
                    <exclude>**/*.woff2</exclude>
                    <exclude>**/*.ttf</exclude>