Merge branch 'score_shop' into api_score_meger

jyy

2021-07-27 7ef344dbe8fa92d479477d3cec483872f8080b77

 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>
@@ -57,6 +63,12 @@
            <id>lhx</id>
            <properties>
                <env>lhx</env>
            </properties>
        </profile>
        <profile>
            <id>xcshop</id>
            <properties>
                <env>xcshop</env>
            </properties>
        </profile>
    </profiles>
@@ -391,14 +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>
@@ -414,6 +428,7 @@
                    <include>**/*.woff2</include>
                    <include>**/*.ttf</include>
                    <include>**/*.xls</include>
                    <include>**/*.xml</include>
                </includes>
            </resource>
            <resource>