Merge branch 'score_shop' into api_score_meger

jyy

2021-07-22 de5d98edb80742185b91b2d892167b82a8b64430

 zq-erp/pom.xml

@@ -48,9 +48,9 @@
            </properties>
        </profile>
        <profile>
            <id>mdPrd</id>
            <id>mdprd</id>
            <properties>
                <env>mdPrd</env>
                <env>mdprd</env>
            </properties>
        </profile>
        <profile>
@@ -403,12 +403,12 @@

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

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

                    <exclude>config/config.json</exclude>
                    <exclude>config/application.properties</exclude>
@@ -428,6 +428,7 @@
                    <include>**/*.woff2</include>
                    <include>**/*.ttf</include>
                    <include>**/*.xls</include>
                    <include>**/*.xml</include>
                </includes>
            </resource>
            <resource>