From e09449ffcf303f67f5bbd168383b285600a251ec Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:25:48 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/pom.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 46c274e..ed1dc1f 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -59,6 +59,12 @@
<env>lhx</env>
</properties>
</profile>
+ <profile>
+ <id>xcshop</id>
+ <properties>
+ <env>xcshop</env>
+ </properties>
+ </profile>
</profiles>
<dependencies>
@@ -393,12 +399,12 @@
<exclude>config/prd/*</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>
- -->
--
Gitblit v1.9.1