Merge branch 'score_shop' into api_score_meger

jyy

2021-07-10 8ee9b79c7124bd8a1d25b7a49b77df5b1956d21b

Merge branch 'score_shop' into api_score_meger

 zq-erp/pom.xml

@@ -48,6 +48,12 @@
            </properties>
        </profile>
        <profile>
            <id>mdPrd</id>
            <properties>
                <env>mdPrd</env>
            </properties>
        </profile>
        <profile>
            <id>xcx</id>
            <properties>
                <env>xcx</env>
@@ -397,6 +403,7 @@

                    <exclude>config/dev/*</exclude>
                    <exclude>config/prd/*</exclude>
                    <exclude>config/mdPrd/*</exclude>
                    <exclude>config/test/*</exclude>
                    <exclude>config/xcx/*</exclude>
                    <exclude>config/xcshop/*</exclude>