From de5d98edb80742185b91b2d892167b82a8b64430 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Thu, 22 Jul 2021 18:03:24 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/pom.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 56646a2..e9cf484 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,16 +403,16 @@
<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>
<exclude>config/system.properties</exclude>
--->
<exclude>**/*.woff</exclude>
@@ -428,6 +428,7 @@
<include>**/*.woff2</include>
<include>**/*.ttf</include>
<include>**/*.xls</include>
+ <include>**/*.xml</include>
</includes>
</resource>
<resource>
--
Gitblit v1.9.1