Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

wzy

2021-01-19 e63f97c751edba11f85339e86c6cd578cbcd2c20

 zq-erp/pom.xml

@@ -384,14 +384,14 @@
                    <exclude>config/test/*</exclude>
                    <exclude>config/xcx/*</exclude>

                    <!--
                    <!-- -->

                       <exclude>config/config.json</exclude>
                         <exclude>config/application.properties</exclude>
                         <exclude>config/system.properties</exclude>


-->

                    <exclude>**/*.woff</exclude>
                    <exclude>**/*.woff2</exclude>
                    <exclude>**/*.ttf</exclude>
@@ -427,7 +427,7 @@
                <version>3.5.1</version>
                <configuration>
                    <source>1.8</source>
                    <target>1.8}</target>
                    <target>1.8</target>
                    <annotationProcessorPaths>
                        <path>
                            <groupId>org.mapstruct</groupId>