From 79553cb3db14cb9b86fbb0d6aa767b16c786d2fb Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 16 Jan 2021 22:53:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/pom.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index be83b77..1abf6e9 100644
--- a/zq-erp/pom.xml
+++ b/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>
--
Gitblit v1.9.1