合并代码

935090232@qq.com

2021-05-08 9f10609773b45b26c709513f718d0783b19d5cda

合并代码

 zq-erp/pom.xml

@@ -160,7 +160,7 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-thymeleaf</artifactId>
        </dependency>

                    -->


        <dependency>
@@ -401,11 +401,11 @@
                    <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>