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

xiaoyong931011

2021-03-12 6d47ae98e2cc860299bfb976bec226d99a0bcd1b

 zq-erp/pom.xml

@@ -394,11 +394,10 @@
                    <exclude>config/test/*</exclude>
                    <exclude>config/xcx/*</exclude>

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