Merge remote-tracking branch 'origin/master'

jyy

2020-12-07 65eab9d565f951e3125d6767d0400eb5abcc4d51

 zq-erp/pom.xml

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