From 4ade37283f06a39057992828e13058ef804ae606 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 16:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/pom.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index be83b77..c3a9d87 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -386,12 +386,12 @@
<!--
- <exclude>config/config.json</exclude>
- <exclude>config/application.properties</exclude>
- <exclude>config/system.properties</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