From 23acc4e7eb8673e918620586b96eae25c3e651b2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:59:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/pom.xml | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 51a6e51..3f8dd9a 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -48,9 +48,9 @@
</properties>
</profile>
<profile>
- <id>mdPrd</id>
+ <id>mdprd</id>
<properties>
- <env>mdPrd</env>
+ <env>mdprd</env>
</properties>
</profile>
<profile>
@@ -403,12 +403,12 @@
<exclude>config/dev/*</exclude>
<exclude>config/prd/*</exclude>
- <exclude>config/mdPrd/*</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>
@@ -428,6 +428,7 @@
<include>**/*.woff2</include>
<include>**/*.ttf</include>
<include>**/*.xls</include>
+ <include>**/*.xml</include>
</includes>
</resource>
<resource>
@@ -496,11 +497,7 @@
</repository>
- <repository>
- <id>repository.jboss.org-public</id>
- <name>JBoss.org Maven repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
+
</repositories>
--
Gitblit v1.9.1