From 815b7f21921c620e7605c461a3c4b4bbc4a26494 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 14:42:40 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/pom.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index f11f7a0..111a11a 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,13 +399,14 @@
<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>
-
+-->
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
--
Gitblit v1.9.1