Merge branch 'score_shop' into api_score_meger

jyy

2021-07-12 9b1860f14489c81a9dd581d29e83289a5e114ace

 zq-erp/pom.xml

@@ -408,7 +408,7 @@
                    <exclude>config/xcx/*</exclude>
                    <exclude>config/xcshop/*</exclude>

                    <!---->
                    <!--  -->

                    <exclude>config/config.json</exclude>
                    <exclude>config/application.properties</exclude>