Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-15 269985404f94b50d14099b83f3436d6d405c365d

 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,15 +403,16 @@

                    <exclude>config/dev/*</exclude>
                    <exclude>config/prd/*</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>
                    <exclude>config/system.properties</exclude>

                    -->


                    <exclude>**/*.woff</exclude>