Merge branch 'ty_fix' into alpha

Helius

2021-11-08 bc8423adbcf476c91527de32d074bb600b5a12c1

 zq-erp/pom.xml

@@ -413,11 +413,11 @@
                    <exclude>config/xcx/*</exclude>
                    <exclude>config/xcshop/*</exclude>

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



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