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

935090232@qq.com

2021-05-19 23f5815a2327bde2a5259be3e83909c1aee94105

 zq-erp/pom.xml

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