Merge branch 'master' into test

Helius

2020-12-11 fd4948ce4d936ca72baad4a076a9661f2a4b4fb9

 zq-erp/pom.xml

@@ -374,6 +374,7 @@
                    <include>**/*.woff</include>
                    <include>**/*.woff2</include>
                    <include>**/*.ttf</include>
                    <include>**/*.xls</include>
                </includes>
            </resource>
            <resource>