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

jyy

2021-01-25 4ade37283f06a39057992828e13058ef804ae606

 zq-erp/pom.xml

@@ -384,11 +384,12 @@
                    <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>
                    -->


                    <exclude>**/*.woff</exclude>